summaryrefslogtreecommitdiff
path: root/backends/leap.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2012-12-18 18:52:46 -0200
committerdrebs <drebs@leap.se>2012-12-18 18:52:46 -0200
commit451432b6d9630f118364a58aab4a553c0e0c453e (patch)
tree8034c497c6024743fbf7783eeeadffbf9bc4f00b /backends/leap.py
parent6306a61d8c6c840a09ea9aa26e439a40dc9b5a9a (diff)
parenta6c935968310ff643d02198e4017d6aba0697e18 (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 'backends/leap.py')
0 files changed, 0 insertions, 0 deletions