diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:45:53 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:45:53 -0300 |
| commit | f6b4491f972124271639af80f52f4b6dd6c056ba (patch) | |
| tree | 722854d277f15f43dde882217452bd22999513ef /pkg | |
| parent | 518169758b3aec1beef1ae15bf08cb4906517f49 (diff) | |
| parent | 35e5e7623c260bd35cb924b65f21350145e12233 (diff) | |
Merge remote-tracking branch 'ivan/feature/3574_path-prefix-with-dirspec' into develop
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 9617d92..c89fd19 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,5 +1,5 @@ jsonschema #<=0.8 -- are we done with this conflict? -pyxdg +dirspec protobuf>=2.4.1 protobuf.socketrpc pyopenssl |