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-05-26 22:43:03 -04:00
2020-03-24 16:12:06 +01:00
2020-06-02 15:05:57 +02:00
2020-02-23 12:11:43 +01:00
2020-05-26 22:43:03 -04:00
2020-05-26 11:37:52 +02:00