Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs # Emby.Server.Implementations/Library/UserManager.cs # Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs # Emby.Server.Implementations/Sorting/IsPlayedComparer.cs # Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs # Emby.Server.Implementations/TV/TVSeriesManager.cs # Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs		2020-06-04 16:52:23 -04:00
..
Hls	Merge pull request #3180 from xumix/master	2020-06-03 02:47:15 -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-06-04 16:52:23 -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	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 regressions introduced by #3098	2020-05-14 20:11:34 -04:00