aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-07-22 15:29:52 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-07-22 15:29:52 +0200
commit9e1c6686136b12d16916c94c00b644ebd0507ae1 (patch)
treed935224b969e4a7af1cb0ac489f8be4dbc97b1b3 /src/eu/siacs
parentc3ef8e0a5bcc36939a09973352623da1c6ed6b77 (diff)
parent9b53ebd44bb9029e60a86acdc03c96d3f0a17329 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions