jellyfin-server/Jellyfin.Api
David 90039e1ad3 Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs
2020-07-22 11:02:44 +02:00
..
Auth changes from merge 2020-07-20 14:43:54 -06:00
Constants Move LibraryService.cs to Jellyfin.Api 2020-06-19 13:10:10 -06:00
Controllers Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio 2020-07-22 11:02:44 +02:00
Extensions Make all optional strings nullable 2020-06-27 10:50:44 -06:00
Helpers Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio 2020-07-22 11:02:44 +02:00
Models Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio 2020-07-22 11:02:44 +02:00
BaseJellyfinApiController.cs Fix merge and build 2020-06-13 13:11:41 -06:00
Jellyfin.Api.csproj Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
MvcRoutePrefix.cs Add style rules and fix it all 2019-11-23 20:31:17 +01:00