Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
Extensions	Document JSON options change	2020-04-15 17:02:43 -06:00
Migrations	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
Properties	Merge remote-tracking branch 'upstream/master' into development-https	2020-04-01 23:21:30 +02:00
Resources/Configuration	Increase min log level to 'Warning' framework namespaces	2020-03-03 00:36:54 +01:00
CoreAppHost.cs	Apply review suggestion and fix entity concurrency tokens.	2020-05-31 17:00:57 -04:00
Jellyfin.Server.csproj	Merge pull request #3298 from jellyfin/dependabot/nuget/SQLitePCLRaw.bundle_e_sqlite3-2.0.3	2020-06-12 13:34:57 +09:00
Program.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	2020-05-29 11:28:19 +02:00
Startup.cs	Merge branch 'master' into websocket	2020-05-02 00:54:04 +02:00
StartupOptions.cs	Renaming variable and refactoring IF statement	2020-05-20 09:11:26 +01:00