Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -04:00
..
Hls	Fix regressions introduced by #3098	2020-05-14 20:11:34 -04:00
Progressive	Fix regressions introduced by #3098	2020-05-14 20:11:34 -04:00
BaseStreamingService.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
MediaInfoService.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
StaticRemoteStreamWriter.cs	ReSharper Reformat: Properties to expression bodied form.	2019-01-13 21:31:14 +01:00
StreamRequest.cs	Fix warnings	2020-01-31 22:26:53 +01:00
StreamState.cs	Add Transcoding framerate info	2020-01-24 23:33:32 +01:00
TranscodingThrottler.cs	Remove custom Threading	2019-02-05 16:47:50 +01:00
UniversalAudioService.cs	Fix regressions introduced by #3098	2020-05-14 20:11:34 -04:00