Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
ImageSaver.cs	undo erroneous changes	2020-06-05 18:29:58 -06:00
ItemImageProvider.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
MetadataService.cs	Merge pull request #3254 from crobibero/ilogger	2020-06-13 00:29:43 +09:00
ProviderManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
ProviderUtils.cs	Fix a small number of compile warnings	2020-06-09 23:12:53 +01:00