Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		2021-03-14 10:19:35 -04:00
..
Properties
Emby.Drawing.csproj	FxCop -> Net Analyzers (part 1)	2021-03-09 03:04:47 +01:00
ImageProcessor.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
NullImageEncoder.cs