diff options
| author | Kali Kaneko <kali@leap.se> | 2014-04-09 16:24:12 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-04-09 16:24:12 -0500 |
| commit | cf9fb29fd1098f694974ee60e5673f22e286d859 (patch) | |
| tree | 5cdc4210b8c944ee4f2669fd8096998d507beda3 /pkg/requirements.pip | |
| parent | f0232265a2725d8129b472479dd380b9ec3ca6b2 (diff) | |
| parent | 81715dc47d77934c4f67d2527a56c28f58f0345d (diff) | |
Merge tag '0.5.0' into deb-0.5.0
Tag leap.bitmask version 0.5.0
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'pkg/requirements.pip')
| -rw-r--r-- | pkg/requirements.pip | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 0efe51e5..3520d82e 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -10,18 +10,17 @@ requests>=1.1.0 srp>=1.0.2 pyopenssl python-dateutil -psutil +psutil==1.2.1 ipaddr twisted -qt4reactor python-daemon # this should not be needed for Windows. keyring zope.proxy -leap.common>=0.3.6.99 -leap.soledad.client>=0.4.99 -leap.keymanager>=0.3.7.99 -leap.mail>=0.3.8.99 +leap.common>=0.3.5 +leap.soledad.client>=0.5.0 +leap.keymanager>=0.3.8 +leap.mail>=0.3.9 # Remove this when u1db fixes its dependency on oauth oauth |