aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-17 22:03:12 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-17 22:03:12 +0200
commitb79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (patch)
tree6f8f258bcfd6d52f6714ff40636b9ee3801d624c /res
parent2abb57be34effbb0606ae099bfefee472542662e (diff)
parent66aacf7e3edae1e4a6ec6cab72df82ae38daa096 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions