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
..
ExternalPortForwarding.cs	Fix merge with master	2020-04-26 16:55:00 -04:00
LibraryChangedNotifier.cs	Initial migration code	2020-05-12 22:10:35 -04:00
RecordingNotifier.cs	Initial migration code	2020-05-12 22:10:35 -04:00
ServerEventNotifier.cs	Initial migration code	2020-05-12 22:10:35 -04:00
StartupWizard.cs	Merge branch 'master' into register-services-correctly	2020-04-22 13:05:03 -04:00
UdpServerEntryPoint.cs	Fix some warnings in Emby.Server.Implementations	2020-02-06 15:21:38 +01:00
UserDataChangeNotifier.cs	Merge branch 'master' into warn17	2020-03-11 20:26:43 +01:00