diff options
| author | drebs <drebs@leap.se> | 2012-12-18 18:52:46 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2012-12-18 18:52:46 -0200 |
| commit | c0544a775a14f6d60b3f159c66eaff2332732346 (patch) | |
| tree | 5542abc00c135052130fc0fd04b3b29b5ee4eae5 /src/leap/testing | |
| parent | 7a67c36efd95d86dea04ab0741c68f5307a95c09 (diff) | |
| parent | ece9f7c2116fa961cafabcc6a5790206412c95ae (diff) | |
Merge branch 'feature/u1db-openstack-backend' of ssh://code.leap.se/leap_client into feature/u1db-openstack-backend
Conflicts:
src/leap/soledad/backends/leap.py
Diffstat (limited to 'src/leap/testing')
0 files changed, 0 insertions, 0 deletions