Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
Properties
Emby.Drawing.csproj	Merge branch 'master' into nullable4	2020-04-23 11:29:19 +02:00
ImageProcessor.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
NullImageEncoder.cs	Move logic of computing Blurhash components to ImageProcessor	2020-06-01 18:12:49 +03:00