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

..

DeleteOptions.cs

…

IIntroProvider.cs

…

ILibraryManager.cs

…

ILibraryMonitor.cs

…

ILibraryPostScanTask.cs

…

ILiveStream.cs

…

IMediaSourceManager.cs

…

IMediaSourceProvider.cs

…

IMetadataFileSaver.cs

…

IMetadataSaver.cs

…

IMusicManager.cs

…

IntroInfo.cs

…

ISearchEngine.cs

…

ItemChangeEventArgs.cs

…

ItemResolveArgs.cs

…

ItemUpdateType.cs

…

IUserDataManager.cs

…

IUserManager.cs

…

IUserViewManager.cs

…

LibraryManagerExtensions.cs

…

MetadataConfigurationStore.cs

…

NameExtensions.cs

…

PlaybackProgressEventArgs.cs

…

PlaybackStopEventArgs.cs

…

Profiler.cs

…

SearchHintInfo.cs

…

TVUtils.cs

…

UserDataSaveEventArgs.cs

…