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
..
2019-09-25 17:19:48 +02:00
2020-05-20 13:07:53 -04:00
2019-02-02 21:45:29 +01:00
2020-05-26 22:43:03 -04:00
2019-10-15 17:49:49 +02:00