diff options
| author | drebs <drebs@leap.se> | 2013-01-22 10:09:43 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-22 10:09:43 -0200 |
| commit | 3359370d9ae06ffc0d60930e7f997d2331dc9037 (patch) | |
| tree | 252b348a0501976e099cc45c386d95d0a05b8367 /.gitattributes | |
| parent | 6fb952397573f4bc90f4cd9e72b49fcf6256e95c (diff) | |
| parent | 9fc4829334e337155ef49de168e492ed7cfe58d7 (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/__init__.py
src/leap/soledad/backends/couch.py
src/leap/soledad/backends/leap_backend.py
src/leap/soledad/backends/objectstore.py
src/leap/soledad/tests/test_couch.py
src/leap/soledad/tests/test_logs.py
src/leap/soledad/tests/test_sqlcipher.py
src/leap/soledad/util.py
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions