aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-29 19:13:42 +0100
committerKim Alvefur <zash@zash.se>2012-12-29 19:13:42 +0100
commit1ae08f23d712da167747a7d59feac9965d6ef9ac (patch)
tree085b256214be1d86062ebb25c7729451da838e12 /net
parent18d85d2a745f67eb48fdf20328e81857e04c6261 (diff)
parent45da10ec05dec7fcad1b32d90cc3175c3f7e2548 (diff)
downloadprosody-1ae08f23d712da167747a7d59feac9965d6ef9ac.tar.gz
prosody-1ae08f23d712da167747a7d59feac9965d6ef9ac.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/server.lua b/net/server.lua
index d80b8a18..3cdbe551 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -62,9 +62,8 @@ if prosody then
for k, v in pairs(event_settings) do
server.cfg[k] = v;
end
- return true;
else
- return server.changesettings(settings);
+ server.changesettings(settings);
end
end
load_config();