aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-03 18:21:34 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-03 18:21:34 +0200
commit38e2110aa4832aa9ed19569af7d9762d401d2012 (patch)
tree54ab12120d621f24512047b83e81ac9dcec90bdd /src/eu/siacs
parentd7f5e5192314249c395a92c1572e861fb4b05ac3 (diff)
parent7eaedd296e1abce472747acaa3a9930279bebe15 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions