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 /client/pkg/requirements.pip | |
| 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 'client/pkg/requirements.pip')
| -rw-r--r-- | client/pkg/requirements.pip | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 38b83251..90277fc1 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -3,6 +3,9 @@ simplejson u1db scrypt pycryptopp + +# cchardet not packaged, we need python-chardet from the +# repos instead. chardet zope.proxy @@ -19,6 +22,3 @@ leap.soledad.common>=0.6.0 # this is not strictly needed by us, but we need it # until u1db adds it to its release as a dep. oauth - -# pysqlite should not be a dep, see #2945 -pysqlite |