Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -04:00
..
Properties	Adjusted AssemblyCopyright attribute values.	2019-03-14 22:17:56 +01:00
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-11 18:23:12 -04:00
NullImageEncoder.cs	Move logic of computing Blurhash components to ImageProcessor	2020-06-01 18:12:49 +03:00