diff options
author | kruks23 <scardenas@openmailbox.org> | 2014-05-18 19:10:52 +0200 |
---|---|---|
committer | kruks23 <scardenas@openmailbox.org> | 2014-05-18 19:10:52 +0200 |
commit | e27bb52575df02d21aa685705f11fcdf7f74889c (patch) | |
tree | 717985d47b4dd9f98112618dba960ed5f078eb1e /.gitignore | |
parent | b79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (diff) | |
parent | 590e2403ab6d9d8f3b0158bf5218802216e9cd50 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions