crobibero 88b6c26472 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-channel ... # Conflicts: # Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs		2020-06-03 09:38:49 -06:00
..
Auth	Update Jellyfin.Api/Auth/FirstTimeSetupOrElevatedPolicy/FirstTimeSetupOrElevatedRequirement.cs	2019-11-26 10:20:45 +01:00
Constants	Fix more review comments	2019-11-24 19:25:46 +01:00
Controllers	Merge remote-tracking branch 'remotes/upstream/api-migration' into api-channel	2020-06-03 09:38:49 -06:00
Helpers	Merge upstream/api-migration	2020-05-24 12:33:16 -06:00
Models	Merge pull request #2962 from crobibero/api-config	2020-06-01 09:29:34 -06:00
BaseJellyfinApiController.cs	Add style rules and fix it all	2019-11-23 20:31:17 +01:00
Jellyfin.Api.csproj	bump swashbuckle	2020-04-21 15:49:04 -06:00
MvcRoutePrefix.cs	Add style rules and fix it all	2019-11-23 20:31:17 +01:00