aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-14 17:09:43 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-14 17:09:43 +0100
commitfed4a58f4e364a5901420285dcc13397467027a1 (patch)
treef2800eeb57490521ae13f0a6f9bbe4f712689f2f
parent23151a9316278647e44d0d790317d75f33cdfd93 (diff)
parent03b271483880edddaa4df17f60ac261dc9c14a5f (diff)
downloadprosody-fed4a58f4e364a5901420285dcc13397467027a1.tar.gz
prosody-fed4a58f4e364a5901420285dcc13397467027a1.zip
Merge with 0.5
-rw-r--r--prosody.cfg.lua.dist1
1 files changed, 1 insertions, 0 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 0cbab947..38618131 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -52,6 +52,7 @@ Host "*"
"uptime"; -- Report how long server has been running
"time"; -- Let others know the time here on this server
"ping"; -- Replies to XMPP pings with pongs
+ "pep"; -- Enables users to publish their mood, activity, playing music and more
"register"; -- Allow users to register on this server using a client and change passwords
-- Other specific functionality