diff options
| author | Kali Kaneko <kali@leap.se> | 2014-11-24 18:43:21 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-11-24 18:43:21 +0100 |
| commit | e232d1aff7d0f0fcd56ae6ce8af43cd5036f3f15 (patch) | |
| tree | 8c36d0795fa2829b271a354c43caa0b56a4be1cb /debian/soledad-server.pyremove | |
| parent | ae09eeda9d5d1746a29664fba3c4ca4ddf467459 (diff) | |
| parent | ac9a0212c03cb9e35241b7ce07eb0d0bd64b7879 (diff) | |
Merge branch 'debian/experimental' of ssh://leap.se/soledad into debian/experimental
Conflicts:
client/pkg/requirements.pip
Diffstat (limited to 'debian/soledad-server.pyremove')
0 files changed, 0 insertions, 0 deletions