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
..
EncodingHelper.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
EncodingJobInfo.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
EncodingJobOptions.cs
IAttachmentExtractor.cs
IEncodingManager.cs
ImageEncodingOptions.cs
IMediaEncoder.cs
ISubtitleEncoder.cs
JobLogger.cs
MediaEncoderHelpers.cs
MediaInfoRequest.cs