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
..
IImageEncoder.cs	Move logic of computing Blurhash components to ImageProcessor	2020-06-01 18:12:49 +03:00
IImageProcessor.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
ImageCollageOptions.cs	Reformat JustAMan review pt2 changes	2019-01-17 20:24:39 +01:00
ImageHelper.cs	Fix profile images.	2020-05-20 12:09:52 -04:00
ImageProcessingOptions.cs	Simplify image processing by removing image enhancers	2020-01-21 20:26:30 +01:00
ImageProcessorExtensions.cs	Warnings cleanup	2020-05-22 20:20:18 -04:00
ImageStream.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00