e5380c653b
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
Auth | ||
Helpers | ||
ModelBinders | ||
Jellyfin.Api.Tests.csproj | ||
TestHelpers.cs |
e5380c653b
# Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj |
||
---|---|---|
.. | ||
Auth | ||
Helpers | ||
ModelBinders | ||
Jellyfin.Api.Tests.csproj | ||
TestHelpers.cs |