diff options
author | kruks23 <scardenas@openmailbox.org> | 2014-05-17 20:41:33 +0200 |
---|---|---|
committer | kruks23 <scardenas@openmailbox.org> | 2014-05-17 20:41:33 +0200 |
commit | 2abb57be34effbb0606ae099bfefee472542662e (patch) | |
tree | 8b2f26187a2dd6d311618864eb03c7db718eb7c9 /.gitmodules | |
parent | 813896dbc9229c29b09798a296553a7d8caf07c6 (diff) | |
parent | 736e09fbb56fbdc4aca4e9bdc9875a5df60cb562 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions