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 /server/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 'server/pkg')
| -rw-r--r-- | server/pkg/requirements.pip | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip index 7cbca401..be5d156b 100644 --- a/server/pkg/requirements.pip +++ b/server/pkg/requirements.pip @@ -3,7 +3,7 @@ couchdb simplejson u1db routes -PyOpenSSL +PyOpenSSL<0.14 # TODO: maybe we just want twisted-web? twisted>=12.0.0 |