alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 04:48:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into userdb-efcore

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
This commit is contained in:
Patrick Barron
2020-06-13 19:41:05 -04:00
parent e8f8307521 403cd3205f
commit 42b4f0aa2e
132 changed files with 197 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@@ -29,7 +29,7 @@ namespace Emby.Server.Implementations.EntryPoints
private readonly ISessionManager _sessionManager;
private readonly IUserManager _userManager;
private readonly ILogger _logger;
private readonly ILogger<LibraryChangedNotifier> _logger;
/// <summary>
/// The library changed sync lock.