Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -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-06-11 18:23:12 -04:00
TrailersService.cs	Remove support for injecting ILogger directly	2020-05-12 16:03:15 -04:00