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
..
Auth	Merge branch 'master' into userdb-efcore	2020-05-26 20:29:11 -04:00
Constants	Fix more review comments	2019-11-24 19:25:46 +01:00
Controllers	Initial migration code	2020-05-12 22:10:35 -04:00
Models/StartupDtos	Move appbuilder and service collection to Jellyfin.Server	2019-11-24 15:27:58 +01:00
BaseJellyfinApiController.cs	Use builtin JSON Mime type constant	2020-04-23 16:15:59 -06:00
Jellyfin.Api.csproj	Update to .NET Core 3.1.4	2020-05-17 13:33:38 -04:00
MvcRoutePrefix.cs	Add style rules and fix it all	2019-11-23 20:31:17 +01:00