aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-02 14:28:02 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-02 14:28:02 +0100
commit093c5275c6edef12084006ad41e23e8bd7fdcfdc (patch)
tree024a0efb3cc2dc5b53abe7d794b445bf0619a379 /src/main/java/eu/siacs/conversations/ui
parent3df23a4f75263d17a4db95a9a4f8c26c0246962c (diff)
parentf178f23177c9b50125d422938259bc6bf1848cdd (diff)
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
0 files changed, 0 insertions, 0 deletions