You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron c1360a1dc3 Merge branch 'master' into userdb-efcore ... # 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		4 years ago
..
ArtKind.cs	Apply review suggestions	4 years ago
DynamicDayOfWeek.cs	Initial migration code	4 years ago
MediaFileKind.cs	Apply review suggestions	4 years ago
PermissionKind.cs	Initial migration code	4 years ago
PersonRoleType.cs	Apply review suggestions	4 years ago
PreferenceKind.cs	Merge branch 'master' into userdb-efcore	4 years ago
SubtitlePlaybackMode.cs	Initial migration code	4 years ago
UnratedItem.cs	Initial migration code	4 years ago
Weekday.cs	Apply review suggestions	4 years ago