aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-12 23:50:49 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-12 23:50:49 +0200
commit2127fcb90285028c056670cace7534bb9588c32b (patch)
tree626742033051977e02cfc008c20326e01884b554 /res
parent8a36958b8892c78d23e11f95fa1cbf0f555120fe (diff)
parente6eef53768d6a021872a9f649aa7614d565f4f3a (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions