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
..
BoxSet.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
Movie.cs	Merge branch 'master' into userdb-efcore	2020-06-11 18:23:12 -04:00