Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -04:00
..
Extensions	Document JSON options change	2020-04-15 17:02:43 -06:00
Migrations	Merge branch 'master' into userdb-efcore	2020-06-11 18:23:12 -04:00
Properties	Merge remote-tracking branch 'upstream/master' into development-https	2020-04-01 23:21:30 +02:00
Resources/Configuration
CoreAppHost.cs	Apply review suggestion and fix entity concurrency tokens.	2020-05-31 17:00:57 -04:00
Jellyfin.Server.csproj	Migrate User DB to EF Core	2020-05-20 10:04:00 -04: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