jellyfin/Emby.Server.Implementations
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-06-05 18:15:56 -06:00
2020-04-19 13:39:12 -04:00
2020-06-13 13:03:09 -06:00
2020-06-15 10:41:00 +12:00
2020-06-16 16:11:30 +12:00
2020-06-16 15:12:48 -06:00
2020-07-13 16:33:39 +01:00
2020-06-15 10:45:55 +12:00
2020-07-18 16:21:01 -04:00
2020-06-20 18:13:11 +12:00
2020-06-20 21:12:36 +12:00
2020-07-07 18:20:17 -04:00
2020-06-20 21:12:36 +12:00
2020-07-14 08:25:02 +09:00
2020-07-15 19:04:36 +02:00