mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-09 12:58:37 +02:00
# Conflicts: # Emby.Server.Implementations/Data/SqliteUserDataRepository.cs # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Entities/User.cs # Jellyfin.Data/ISavingChanges.cs # Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj # Jellyfin.Server.Implementations/JellyfinDb.cs # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Model/Notifications/NotificationOptions.cs # MediaBrowser.sln |
||
---|---|---|
.. | ||
ArtKind.cs | ||
DynamicDayOfWeek.cs | ||
MediaFileKind.cs | ||
PermissionKind.cs | ||
PersonRoleType.cs | ||
PreferenceKind.cs | ||
SubtitlePlaybackMode.cs | ||
UnratedItem.cs | ||
Weekday.cs |