aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-22 19:05:28 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-22 19:05:28 +0200
commitde3739970b32a927d8c1ec5f7a378fa50c4b4f99 (patch)
tree011c2dc3bc64ccecd92653c62debadcfc8e1a023 /src/eu/siacs
parentd04afe453a277dfe7d7018c55068d2b4fed6c387 (diff)
parentf6cf5e9c2fd6d1f904b12ae8979e23de26c4d725 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions