diff options
| author | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
| commit | 293c71080e9a21115d248e46d1a706c53cc8ee37 (patch) | |
| tree | 3353672f1f770ef5f5c87ea7e3e27debe737a50b /server/.gitattributes | |
| parent | fa7708e256ba56cd1e9913993d68611b4ae95824 (diff) | |
| parent | 9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff) | |
Merge tag '0.7.0'
Tag version 0.7.0.
Conflicts:
CHANGELOG
client/src/leap/soledad/client/__init__.py
client/src/leap/soledad/client/sqlcipher.py
client/src/leap/soledad/client/target.py
server/pkg/soledad-server
Diffstat (limited to 'server/.gitattributes')
0 files changed, 0 insertions, 0 deletions