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
..
CollectionService.cs	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
MoviesService.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
TrailersService.cs	Remove support for injecting ILogger directly	2020-05-12 16:03:15 -04:00