mirror of
https://github.com/jellyfin/jellyfin
synced 2024-10-15 12:13:04 +00:00
e5380c653b
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
Properties | ||
Emby.Drawing.csproj | ||
ImageProcessor.cs | ||
NullImageEncoder.cs |