aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-31 18:21:46 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-31 18:21:46 +0200
commitbda7724e317dd46f831df29c4c920b3913c533cb (patch)
treee5c072207e2c6850a3becd1de8657365ec7eb4b5 /src/eu/siacs/conversations/ui
parent28fa48704d4084617d7e32e4a10f785c4b996163 (diff)
improvements for merge conditions
Diffstat (limited to 'src/eu/siacs/conversations/ui')
0 files changed, 0 insertions, 0 deletions