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-26 23:42:41 +00:00
commit 6da5edbbd9

View File

@ -24,18 +24,18 @@ main.text.them=bold_white
main.splash=bold_red main.splash=bold_red
main.time=yellow main.time=yellow
input.text=bold_green input.text=bold_green
subscribed=bold_green subscribed=green
unsubscribed=red unsubscribed=red
otr.started.trusted=green otr.started.trusted=green
otr.started.untrusted=yellow otr.started.untrusted=yellow
otr.ended=red otr.ended=red
otr.trusted=green otr.trusted=green
otr.untrusted=yellow otr.untrusted=yellow
online=bold_green online=green
away=bold_cyan away=cyan
chat=bold_white chat=white
dnd=magenta dnd=magenta
xa=bold_blue xa=blue
offline=red offline=red
incoming=bold_yellow incoming=bold_yellow
typing=yellow typing=yellow