diff options
| author | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
| commit | 570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch) | |
| tree | 0f262acacf35743664c6408edbafe6ba6f119d14 /src/leap/soledad/tests/u1db_tests/test_sync.py | |
| parent | e60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff) | |
| parent | 10a2303fe2d21999bce56940daecb78576f5b741 (diff) | |
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch,
minus soledad and email components.
Diffstat (limited to 'src/leap/soledad/tests/u1db_tests/test_sync.py')
0 files changed, 0 insertions, 0 deletions