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
..
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	Fix startup wizard.	2020-06-09 14:04:25 -04:00
Models/StartupDtos	Enable TreatWarningsAsErrors for more projects	2020-06-03 13:22:40 +02: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.5	2020-06-11 07:13:56 -06:00
MvcRoutePrefix.cs	Add style rules and fix it all	2019-11-23 20:31:17 +01:00