diff options
| author | Micah Anderson <micah@riseup.net> | 2013-07-18 15:07:02 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-07-18 15:07:02 -0400 |
| commit | f7abca2c5a0485e08512c57bb0c33b7c50bccc16 (patch) | |
| tree | 8af19bdec0d741ed13598cbd78a20370988068f8 /soledad_server/pkg | |
| parent | 1c5970e6b5deed9880aa56f93cc82aa8ebd7afe7 (diff) | |
| parent | 58ddd064585763be2d677b1d1066c703e7fe04f6 (diff) | |
Merge branch 'debian' of ssh://leap.se/soledad into debian
Conflicts:
soledad/src/leap/soledad/__init__.py
Diffstat (limited to 'soledad_server/pkg')
0 files changed, 0 insertions, 0 deletions