diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-09 15:21:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 15:21:24 -0400 |
| commit | f4a73e90d2b06a93f0afb1153a5178e341523af4 (patch) | |
| tree | d4829ee7d44aeef8ea7d197b475afaa87c9e212c /Emby.Server.Core/ApplicationHost.cs | |
| parent | c8c4eb3ab5ff88aa7f756c096b4f896e0dae68f7 (diff) | |
| parent | 9931f055a86dada900d20567d4e5e7bc99447c5d (diff) | |
Merge pull request #2625 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 78bdc1189..6a3881caf 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -1132,7 +1132,8 @@ namespace Emby.Server.Core // Custom cert return new CertificateInfo { - Path = ServerConfigurationManager.Configuration.CertificatePath + Path = ServerConfigurationManager.Configuration.CertificatePath, + Password = ServerConfigurationManager.Configuration.CertificatePassword }; } |