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
..
DeleteOptions.cs
IIntroProvider.cs	Initial migration code	2020-05-12 22:10:35 -04:00
ILibraryManager.cs	Merge branch 'master' into userdb-efcore	2020-06-11 18:23:12 -04:00
ILibraryMonitor.cs
ILibraryPostScanTask.cs
ILiveStream.cs
IMediaSourceManager.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
IMediaSourceProvider.cs	Address comments	2020-04-01 19:05:41 +02:00
IMetadataFileSaver.cs
IMetadataSaver.cs
IMusicManager.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
IntroInfo.cs
ISearchEngine.cs
ItemChangeEventArgs.cs
ItemResolveArgs.cs
ItemUpdateType.cs
IUserDataManager.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
IUserManager.cs	Properly remove profile images	2020-06-11 17:51:02 -04:00
IUserViewManager.cs
LibraryManagerExtensions.cs
MetadataConfigurationStore.cs
NameExtensions.cs	Remove unused usings	2020-03-24 16:12:06 +01:00
PlaybackProgressEventArgs.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
PlaybackStopEventArgs.cs
Profiler.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
SearchHintInfo.cs
TVUtils.cs
UserDataSaveEventArgs.cs