jellyfin/MediaBrowser.Controller
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-02-23 10:53:51 +01:00
2020-06-16 16:11:30 +12:00
2020-06-20 18:13:11 +12:00
2020-07-04 11:54:25 -04:00
2020-06-16 16:11:30 +12:00
2020-07-04 11:54:25 -04:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00
2020-06-16 16:11:30 +12:00
2020-06-24 15:09:15 -06:00
2020-06-16 16:11:30 +12:00