diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 17:28:25 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 17:28:25 -0300 |
| commit | 1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 (patch) | |
| tree | 8d96c7a374c91699c55fb8c5b609aac222a94e74 /pkg/requirements.pip | |
| parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) | |
| parent | 222ce2a1513a3776b3277ded365672d7d43ad2e4 (diff) | |
Merge branch 'release-0.3.3'0.3.3
Conflicts:
pkg/requirements.pip
setup.py
src/leap/bitmask/config/leapsettings.py
Diffstat (limited to 'pkg/requirements.pip')
| -rw-r--r-- | pkg/requirements.pip | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 081f3ba9..154e51b4 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -16,11 +16,10 @@ twisted qt4reactor python-gnupg python-daemon # this should not be needed for Windows. - -keyring<=2.9 # See #3759 +keyring leap.common>=0.3.2 -leap.soledad.client>=0.3.0 +leap.soledad.client>=0.4.0 leap.keymanager>=0.2.0 leap.mail>=0.3.2 |