summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-22 10:09:43 -0200
committerdrebs <drebs@leap.se>2013-01-22 10:09:43 -0200
commit3359370d9ae06ffc0d60930e7f997d2331dc9037 (patch)
tree252b348a0501976e099cc45c386d95d0a05b8367 /setup.cfg
parent6fb952397573f4bc90f4cd9e72b49fcf6256e95c (diff)
parent9fc4829334e337155ef49de168e492ed7cfe58d7 (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 'setup.cfg')
0 files changed, 0 insertions, 0 deletions