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-12 22:10:35 -04:00
2020-04-01 19:05:41 +02:00
2020-05-20 13:07:53 -04:00
2020-06-11 17:51:02 -04:00
2020-03-24 16:12:06 +01:00