diff options
| author | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
| commit | 1a9eb8218722ae64643c8e77f381c5609a89e18f (patch) | |
| tree | 37001cefd064f3acd71ffc916508a206629bd4a0 /docs/conf.py | |
| parent | 04f7e29aaf29edd693265831a609db681641390d (diff) | |
| parent | cfeddae5b94a6ab9883f3226702dee31850d638f (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts:
src/leap/soledad/__init__.py
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions