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
..
Resolvers	Merge pull request #3254 from crobibero/ilogger	2020-06-13 00:29:43 +09:00
Validators	Use typed logger where possible	2020-06-05 18:15:56 -06:00
CoreResolutionIgnoreRule.cs
ExclusiveLiveStream.cs
IgnorePatterns.cs
LibraryManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
LiveStreamHelper.cs
MediaSourceManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
MediaStreamSelector.cs	Make SonarCloud less angry	2020-05-26 22:43:03 -04:00
MusicManager.cs
PathExtensions.cs
ResolverHelper.cs
SearchEngine.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
UserDataManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
UserViewManager.cs