diff options
| author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
| commit | 71df5a4431bce607550eec4425f4fdfbdbfa2af7 (patch) | |
| tree | f71347068d0a9296c857a5027728130e7ed14ca8 /backends/__init__.py | |
| parent | 3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (diff) | |
| parent | 2f761fea9e72554806b012c64d00fcae80e1d254 (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'backends/__init__.py')
0 files changed, 0 insertions, 0 deletions