aboutsummaryrefslogtreecommitdiffstats
path: root/art
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-29 23:20:01 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-29 23:20:01 +0100
commitf2bf64d19d7eb14f34324311ebf4f95378d81fbe (patch)
treeab5ae7440681eaeda1c85797ddee2a4619be4769 /art
parent0eeead495f62b3e04d33c0ad3648c28f56d10e63 (diff)
parentc237a550932b7e68f2f754b8fe33248ae9f0ee5c (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'art')
0 files changed, 0 insertions, 0 deletions