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
..
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-20 13:07:53 -04:00
2020-04-21 10:18:26 +02:00
2020-04-20 10:18:12 +02:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00