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
..
Hls	Merge pull request #3343 from telans/comment-stops	2020-06-16 11:54:58 +02:00
Progressive	Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio	2020-07-22 11:02:44 +02:00
BaseStreamingService.cs	Merge pull request #3343 from telans/comment-stops	2020-06-16 11:54:58 +02:00
MediaInfoService.cs	Merge remote-tracking branch 'upstream/master' into api-migration-merge	2020-07-20 14:28:33 -06:00
StaticRemoteStreamWriter.cs	Add full stop at end of comments (SA1629)	2020-06-16 10:37:52 +12:00
StreamRequest.cs	Merge pull request #3343 from telans/comment-stops	2020-06-16 11:54:58 +02:00
StreamState.cs	Refactor copy codec checks	2020-05-26 00:58:19 +03:00
TranscodingThrottler.cs	Remove custom Threading	2019-02-05 16:47:50 +01:00
UniversalAudioService.cs	fix SA1513/SA1516	2020-06-16 16:11:30 +12:00