diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-28 10:59:30 -0400 |
| commit | 8fa97c02b5f07f896e52d9bb272128f267af04ea (patch) | |
| tree | e0ce6bbaaa48441ebcfb807a45e8753fe8432423 /pkg/requirements.pip | |
| parent | d272a953a01f5c601e4894a916f7b4d990a03327 (diff) | |
| parent | ccecd1b3750bd10404511c33be1aaca82631a502 (diff) | |
Merge tag '0.4.2' into debian/experimental
Tag leap.common version 0.4.2
Conflicts:
pkg/requirements-testing.pip
setup.cfg
src/leap/common/_version.py
src/leap/common/events/events_pb2.py
Diffstat (limited to 'pkg/requirements.pip')
| -rw-r--r-- | pkg/requirements.pip | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index c89fd19..02fb189 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,8 +1,8 @@ jsonschema #<=0.8 -- are we done with this conflict? dirspec -protobuf>=2.4.1 -protobuf.socketrpc pyopenssl python-dateutil +pyzmq>=14.4.1 +txzmq>=0.7.3 #autopep8 -- ??? |