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 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		5 years ago
..
Auth	Merge branch 'master' into userdb-efcore	5 years ago
Constants	Fix more review comments	5 years ago
Controllers	Initial migration code	5 years ago
Models/StartupDtos	Move appbuilder and service collection to Jellyfin.Server	5 years ago
BaseJellyfinApiController.cs	Use builtin JSON Mime type constant	5 years ago
Jellyfin.Api.csproj	Update to .NET Core 3.1.4	5 years ago
MvcRoutePrefix.cs	Add style rules and fix it all	5 years ago