You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
Extensions	Document JSON options change	4 years ago
Migrations	Merge branch 'master' into userdb-efcore	4 years ago
Properties	Merge remote-tracking branch 'upstream/master' into development-https	4 years ago
Resources/Configuration	Increase min log level to 'Warning' framework namespaces	4 years ago
CoreAppHost.cs	Apply review suggestion and fix entity concurrency tokens.	4 years ago
Jellyfin.Server.csproj	Merge pull request #3298 from jellyfin/dependabot/nuget/SQLitePCLRaw.bundle_e_sqlite3-2.0.3	4 years ago
Program.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	4 years ago
Startup.cs	Merge branch 'master' into websocket	4 years ago
StartupOptions.cs	Renaming variable and refactoring IF statement	4 years ago