aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-19 21:42:23 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-19 21:42:23 +0200
commita5a356a7a7312c64d6d6c81ee773a36fe556233d (patch)
treea8de434a134e00fcbab431f8ce7f8c202d07883f /res
parent2a1067b20a5c5b1948550e5370d3d8f02b2c557b (diff)
parent371c985c25d0b7ed348a1f2328673636acb939d7 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions