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		2020-05-12 22:22:20 -04:00
..
ArtKind.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00
DynamicDayOfWeek.cs	Initial migration code	2020-05-12 22:10:35 -04:00
MediaFileKind.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00
PermissionKind.cs	Initial migration code	2020-05-12 22:10:35 -04:00
PersonRoleType.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00
PreferenceKind.cs	Merge branch 'master' into userdb-efcore	2020-05-12 22:22:20 -04:00
SubtitlePlaybackMode.cs	Initial migration code	2020-05-12 22:10:35 -04:00
UnratedItem.cs	Initial migration code	2020-05-12 22:10:35 -04:00
Weekday.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00