mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-20 04:18:51 -07:00
e5380c653b
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
Properties | ||
Emby.Drawing.csproj | ||
ImageProcessor.cs | ||
NullImageEncoder.cs |