diff options
| author | Kim Alvefur <zash@zash.se> | 2014-08-10 10:31:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-08-10 10:31:18 +0200 |
| commit | e5bb501b309c646337edad211ee14c7de193464a (patch) | |
| tree | 036a3694d936f4a5862d2b8c631599fddbbab355 /prosody.cfg.lua.dist | |
| parent | 04feababf4d9b63876a06fdd52ed41f775c496b0 (diff) | |
| parent | 4cb43c86ad71afa81185bf3e604d9fdd6b860286 (diff) | |
| download | prosody-e5bb501b309c646337edad211ee14c7de193464a.tar.gz prosody-e5bb501b309c646337edad211ee14c7de193464a.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 ade219a8..d2af75a0 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -43,7 +43,7 @@ modules_enabled = { "vcard"; -- Allow users to set vCards -- These are commented by default as they have a performance impact - --"privacy"; -- Support privacy lists + --"blocklist"; -- Allow users to block communications with other users --"compression"; -- Stream compression -- Nice to have |