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 | 3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (patch) | |
| tree | cae77f65c1b4377d4fd6934139c0074a92d3f121 /backends/openstack.py | |
| parent | 629b4ae10e17ab667a0b7ae9966914ea728da839 (diff) | |
| parent | 9a487e87aceddbf656f14961356c74cb7a1de146 (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 'backends/openstack.py')
0 files changed, 0 insertions, 0 deletions