jellyfin/Jellyfin.Server
Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
..
Extensions Document JSON options change 2020-04-15 17:02:43 -06:00
Migrations Cleanup and fix more bugs 2020-05-23 16:07:42 -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 Cleanup and fix more bugs 2020-05-23 16:07:42 -04:00
Jellyfin.Server.csproj Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Program.cs Fix merge 2020-05-10 18:17:12 -04: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