Merge branch 'master' into resource

This commit is contained in:
James Booth
2014-12-05 00:33:21 +00:00

View File

@@ -54,9 +54,9 @@ privileges=true
presence=true
wrap=true
time=minutes
statuses.muc=off
statuses.chat=online
statuses.console=all
statuses.muc=none
statuses.chat=none
statuses.console=none
occupants=true
occupants.size=15
roster=true