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
..
ArtistsService.cs	Fix regressions introduced by #3098	2020-05-14 20:11:34 -04:00
BaseItemsByNameService.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
BaseItemsRequest.cs	Fixed indentation and corrected typo	2020-04-06 23:17:49 -04:00
GenresService.cs	Fix warnings	2020-01-31 22:26:53 +01:00
ItemsService.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
MusicGenresService.cs	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
PersonsService.cs	Fix warnings	2020-01-31 22:26:53 +01:00
PlaystateService.cs	Initial migration code	2020-05-12 22:10:35 -04:00
StudiosService.cs	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
UserLibraryService.cs	Initial migration code	2020-05-12 22:10:35 -04:00
UserViewsService.cs	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
YearsService.cs	Fix warnings	2020-01-31 22:26:53 +01:00