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
..
CameraImageUploadInfo.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
IDeviceManager.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00