Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -04:00
..
Entities	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
Enums	Merge branch 'master' into userdb-efcore	2020-05-12 22:22:20 -04:00
DayOfWeekHelper.cs	Initial migration code	2020-05-12 22:10:35 -04:00
ISavingChanges.cs	Apply review suggestions	2020-05-10 10:54:41 -04:00
Jellyfin.Data.csproj	Address review comments	2020-05-14 17:13:45 -04:00