aboutsummaryrefslogtreecommitdiffstats
path: root/util/datamanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-06-10 13:22:22 +0200
committerKim Alvefur <zash@zash.se>2019-06-10 13:22:22 +0200
commit0269157c4511472cf0bf377d84f6e99876f83d12 (patch)
tree8cd84a76fb673cbfefa00ba1516bd16150f1c780 /util/datamanager.lua
parenta4764762b3dad679f40dadd6eb2eb31ea1d5cace (diff)
parent9a5a3fd0f10693e6cba2779095398614eb94e68c (diff)
downloadprosody-0269157c4511472cf0bf377d84f6e99876f83d12.tar.gz
prosody-0269157c4511472cf0bf377d84f6e99876f83d12.zip
Merge 0.11->trunk
Diffstat (limited to 'util/datamanager.lua')
-rw-r--r--util/datamanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index cf96887b..b52c77fa 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -24,7 +24,7 @@ local t_concat = table.concat;
local envloadfile = require"util.envload".envloadfile;
local serialize = require "util.serialization".serialize;
local lfs = require "lfs";
--- Extract directory seperator from package.config (an undocumented string that comes with lua)
+-- Extract directory separator from package.config (an undocumented string that comes with lua)
local path_separator = assert ( package.config:match ( "^([^\n]+)" ) , "package.config not in standard form" )
local prosody = prosody;