aboutsummaryrefslogtreecommitdiffstats
path: root/art
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-10-29 12:08:32 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-10-29 12:08:32 +0100
commit7410e2023adb2c4535e3301637fa0ecc61e7187c (patch)
treee4ac8a123ce081bc83e432b3e81f355a94b60753 /art
parent1221cff561eb2ca321f96c7510e01f9218634bd6 (diff)
parentd65273ce39ab112ba95d0b852cda6717dbf33c8c (diff)
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'art')
0 files changed, 0 insertions, 0 deletions