e5380c653b
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
Activity | ||
Events | ||
Migrations | ||
Properties | ||
Users | ||
ValueConverters | ||
Jellyfin.Server.Implementations.csproj | ||
JellyfinDb.cs | ||
JellyfinDbProvider.cs | ||
ModelBuilderExtensions.cs |