unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into media-attachments-clean

Browse Source
This commit is contained in:
Andrew Mahone
2019-11-04 10:03:18 -05:00
parent 90dfe729bb 9756bdb76e
commit 1600d5b53f
143 changed files with 1776 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emby.Server.Implementations/ApplicationHost.cs
+2 -2
View File
@@ -364,7 +364,7 @@ namespace Emby.Server.Implementations
{
_configuration = configuration;
XmlSerializer = new MyXmlSerializer(fileSystem, loggerFactory);
XmlSerializer = new MyXmlSerializer();
NetworkManager = networkManager;
networkManager.LocalSubnetsFn = GetConfiguredLocalSubnets;
@@ -912,7 +912,7 @@ namespace Emby.Server.Implementations
_displayPreferencesRepository.Initialize();
var userDataRepo = new SqliteUserDataRepository(LoggerFactory, ApplicationPaths);
var userDataRepo = new SqliteUserDataRepository(LoggerFactory.CreateLogger<SqliteUserDataRepository>(), ApplicationPaths);
SetStaticProperties();