You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
Properties	Adjusted AssemblyCopyright attribute values.	5 years ago
Emby.Drawing.csproj	Merge branch 'master' into nullable4	4 years ago
ImageProcessor.cs	Merge branch 'master' into userdb-efcore	4 years ago
NullImageEncoder.cs	Move logic of computing Blurhash components to ImageProcessor	4 years ago