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-01-24 22:32:38 +00:00
commit 8a69b1e2dd

View File

@ -43,7 +43,7 @@ gone=red
error=red error=red
roominfo=yellow roominfo=yellow
roommention=bold_magenta roommention=bold_magenta
roomtrigger=bold_cyan roomtrigger=bold_red
me=blue me=blue
them=bold_green them=bold_green
roster.header=bold_yellow roster.header=bold_yellow
@ -116,8 +116,8 @@ roster.rooms=true
roster.rooms.order=name roster.rooms.order=name
roster.rooms.unread=after roster.rooms.unread=after
roster.rooms.pos=last roster.rooms.pos=last
roster.rooms.char=#
roster.private=room roster.private=room
roster.private.char=/
occupants=true occupants=true
occupants.size=15 occupants.size=15
occupants.jid=false occupants.jid=false