diff options
| author | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
| commit | 12bee096d1318511feb19f5256e1cb3d4823c5f5 (patch) | |
| tree | 3b6d5005a46f8767f873809d3e450fb0025dc899 /tests/u1db_tests/test_remote_sync_target.py | |
| parent | 517ec48dee4e743a9f68622e14a7b56be6685881 (diff) | |
| parent | c206b64294f1fade1001880f8a6965d39e107088 (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts:
src/leap/soledad/__init__.py
Diffstat (limited to 'tests/u1db_tests/test_remote_sync_target.py')
0 files changed, 0 insertions, 0 deletions