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:
commit
f1a575de26
@ -70,6 +70,7 @@ roster.offline=
|
|||||||
roster.resource=
|
roster.resource=
|
||||||
roster.by=
|
roster.by=
|
||||||
roster.size=
|
roster.size=
|
||||||
|
roster.empty=
|
||||||
occupants=
|
occupants=
|
||||||
occupants.size=
|
occupants.size=
|
||||||
occupants.jid=
|
occupants.jid=
|
||||||
|
@ -70,6 +70,7 @@ roster.offline=true
|
|||||||
roster.resource=false
|
roster.resource=false
|
||||||
roster.by=presence
|
roster.by=presence
|
||||||
roster.size=25
|
roster.size=25
|
||||||
|
roster.empty=true
|
||||||
occupants=true
|
occupants=true
|
||||||
occupants.size=15
|
occupants.size=15
|
||||||
occupants.jid=false
|
occupants.jid=false
|
||||||
|
@ -18,6 +18,7 @@ roster.offline=true
|
|||||||
roster.resource=true
|
roster.resource=true
|
||||||
roster.by=presence
|
roster.by=presence
|
||||||
roster.size=25
|
roster.size=25
|
||||||
|
roster.empty=true
|
||||||
privileges=true
|
privileges=true
|
||||||
presence=true
|
presence=true
|
||||||
intype=true
|
intype=true
|
||||||
|
@ -17,6 +17,7 @@ roster.offline=false
|
|||||||
roster.resource=false
|
roster.resource=false
|
||||||
roster.by=presence
|
roster.by=presence
|
||||||
roster.size=25
|
roster.size=25
|
||||||
|
roster.empty=false
|
||||||
privileges=false
|
privileges=false
|
||||||
presence=false
|
presence=false
|
||||||
intype=false
|
intype=false
|
||||||
|
Loading…
Reference in New Issue
Block a user