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 2015-11-22 01:42:34 +00:00
commit 5f89d867e1
3 changed files with 3 additions and 0 deletions

View File

@ -86,6 +86,7 @@ roster.contact.indent=1
roster.resource.indent=2
roster.presence.indent=-1
roster.header.char=@
roster.wrap=true
occupants=true
occupants.size=15
occupants.jid=false

View File

@ -34,6 +34,7 @@ roster.contact.char=-
roster.contact.indent=2
roster.resource.indent=2
roster.presence.indent=2
roster.wrap=true
privileges=true
presence=true
intype=true

View File

@ -31,6 +31,7 @@ roster.size=25
roster.contact.indent=0
roster.resource.indent=0
roster.presence.indent=-1
roster.wrap=false
privileges=false
presence=false
intype=false