1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2016-02-03 00:37:51 +00:00
commit 4e0884d242

View File

@ -281,8 +281,8 @@ static struct cmd_t command_defs[] =
"/roster show [offline|resource|presence|status|empty|priority|contacts|rooms]", "/roster show [offline|resource|presence|status|empty|priority|contacts|rooms]",
"/roster hide [offline|resource|presence|status|empty|priority|contacts|rooms]", "/roster hide [offline|resource|presence|status|empty|priority|contacts|rooms]",
"/roster by group|presence|none", "/roster by group|presence|none",
"/roster count unread|items|off" "/roster count unread|items|off",
"/roster count zero on|off" "/roster count zero on|off",
"/roster order name|presence", "/roster order name|presence",
"/roster unread before|after|off", "/roster unread before|after|off",
"/roster room char <char>|none", "/roster room char <char>|none",