You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
DeleteOptions.cs	…
IIntroProvider.cs	…
ILibraryManager.cs	…
ILibraryMonitor.cs	…
ILibraryPostScanTask.cs	…
ILiveStream.cs	…
IMediaSourceManager.cs	…
IMediaSourceProvider.cs	…
IMetadataFileSaver.cs	…
IMetadataSaver.cs	…
IMusicManager.cs	…
ISearchEngine.cs	…
IUserDataManager.cs	…
IUserManager.cs	…
IUserViewManager.cs	…
IntroInfo.cs	…
ItemChangeEventArgs.cs	…
ItemResolveArgs.cs	…
ItemUpdateType.cs	…
LibraryManagerExtensions.cs	…
MetadataConfigurationStore.cs	…
NameExtensions.cs	…
PlaybackProgressEventArgs.cs	…
PlaybackStopEventArgs.cs	…
Profiler.cs	…
SearchHintInfo.cs	…
TVUtils.cs	…
UserDataSaveEventArgs.cs	…