diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
| commit | 8de591e85db21c8a189336c630408abdf7c85b1b (patch) | |
| tree | 82d9fd7daebe5ee0a1bd5d099e8249ca97340508 /pkg | |
| parent | e2043a930b9ef98ad68746a2f21585901117892a (diff) | |
| parent | 1fa295ecd6af5c2ea64e76418bd144f9ddf4c803 (diff) | |
Merge tag '0.8.0' into debian/experimental
Tag leap.bitmask version 0.8.0
Conflicts:
pkg/requirements.pip
src/leap/bitmask/gui/mainwindow.py
Diffstat (limited to 'pkg')
| -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 bab134f5..8baaecdb 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -10,9 +10,8 @@ requests>=1.1.0 srp>=1.0.2 pyopenssl -# This won't be needed after we refactor leap.common.events -# to use zmq. -python-dateutil #==1.4 # See https://leap.se/code/issues/6099 +# This won't be needed after we refactor leap.common.events to use zmq. +python-dateutil psutil |