diff options
| author | drebs <drebs@leap.se> | 2014-10-01 15:39:03 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2014-10-01 15:39:03 -0300 |
| commit | 3de445b289f9373e617f216fccbf1cfcff139270 (patch) | |
| tree | 580f8a7384b2ad91c12f53aa2af5034aa9304944 /client/pkg | |
| parent | a7568bd38bdc63de5f074861862390281f49abf0 (diff) | |
| parent | 365fa1603a977040a1891880a66118f196a54ac0 (diff) | |
Merge tag '0.6.0' into deb-0.6.0
Tag leap.soledad version 0.6.0
Conflicts:
client/pkg/requirements.pip
Diffstat (limited to 'client/pkg')
| -rw-r--r-- | client/pkg/requirements.pip | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 7590aee5..ae8d2dac 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -3,12 +3,15 @@ simplejson u1db scrypt pycryptopp +cchardet +taskthread +zope.proxy # # leap deps # -leap.soledad.common>=0.3.0 +leap.soledad.common>=0.3.8 # # XXX things to fix yet: @@ -20,5 +23,3 @@ oauth # pysqlite should not be a dep, see #2945 pysqlite - -chardet |