diff options
author | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
commit | 753dbfaf91c8855555370310ecd1ac228b2ad6c8 (patch) | |
tree | cd04cb8a03e077a91511ed8d509a4e2e83588628 /prosody.cfg.lua.dist | |
parent | 9c9d5678b0e9918da455eb49994c747d777b0775 (diff) | |
parent | 7c0cd1c22e29c9e3e9db902815ca38d73260fd68 (diff) | |
download | prosody-753dbfaf91c8855555370310ecd1ac228b2ad6c8.tar.gz prosody-753dbfaf91c8855555370310ecd1ac228b2ad6c8.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
-rw-r--r-- | prosody.cfg.lua.dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index bd897f74..a0fc6c9e 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -65,7 +65,7 @@ modules_enabled = { -- HTTP modules --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"websockets"; -- XMPP over WebSockets + --"websocket"; -- XMPP over WebSockets --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality |