aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-16 22:49:52 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-16 22:49:52 +0200
commit9b95b07b97c8c51bc0388059704a503e0b11a0d3 (patch)
tree6226065050f9864a90fd4290f11652cf250a4c3e /.gitignore
parente50f0090044ddbb11b83e6cc049c29a30f890878 (diff)
parentcd1afbd39aade757c592e756ff1a1d2df27f1442 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions