diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
| commit | ccb5e87519070a995cfad8090f517d4273cbeec9 (patch) | |
| tree | b18cb027c5578a9efd74e0e4bea0b0d4401abdec /core/certmanager.lua | |
| parent | eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b (diff) | |
| parent | cb8d6cd008a01a8fc7427c9489a2366e17e88a62 (diff) | |
| download | prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.tar.gz prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 74da771e..d6a59b9f 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -19,7 +19,7 @@ local t_concat = table.concat; local t_insert = table.insert; local prosody = prosody; -local resolve_path = configmanager.resolve_relative_path; +local resolve_path = require"util.paths".resolve_relative_path; local config_path = prosody.paths.config; local luasec_has_noticket, luasec_has_verifyext, luasec_has_no_compression; |