aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-18 21:57:27 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-18 21:57:27 +0200
commit1cfe557b2b7035c3b7df26948b82a11dff141e77 (patch)
treea3e9f2f85db66d61c3508fd3a1cafea50854224d /src/eu/siacs/conversations
parentc65600edc9861c5f1788676e03a8164904a79193 (diff)
parent2f514381a22edd8c26c0b15f822c032edc1702df (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions