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
..
2020-07-20 14:43:54 -06:00
2020-07-19 19:03:48 +02:00
2020-06-22 08:14:07 -06:00
2020-07-20 14:43:54 -06:00
2020-06-19 09:01:37 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00
2020-07-20 14:43:54 -06:00