aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
committerkruks23 <scardenas@openmailbox.org>2014-07-09 22:05:48 +0200
commitc7088489bd339e4b8b5128e909a1b4377864a5c9 (patch)
tree56974ad74bfdb025a56e817b952221ce4f2dbbe6 /README.md
parent71324261e5560fa70ef028fba35bd121f2527578 (diff)
parentda79e2cca2ffce6e4e5c3b479c4de702ecca1872 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions