Skip to content

slapos
slapos
Commit 180864ae authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 58d52514 3542b75c
Pipeline #23566 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 4 deletions
    stack/erp5/buildout.cfg
    View file @ 180864ae
    ...@@ -475,7 +475,6 @@ eggs = ${neoppod:eggs} ...@@ -475,7 +475,6 @@ eggs = ${neoppod:eggs}
    astor astor
    APacheDEX APacheDEX
    PyStemmer PyStemmer
    PyXML
    Pympler Pympler
    SOAPpy SOAPpy
    chardet chardet
    ...@@ -720,11 +719,10 @@ Products.PluginRegistry = 1.6 ...@@ -720,11 +719,10 @@ Products.PluginRegistry = 1.6
    Products.TIDStorage = 5.5.0 Products.TIDStorage = 5.5.0
    pyPdf = 1.13 pyPdf = 1.13
    PyStemmer = 1.3.0 PyStemmer = 1.3.0
    PyXML = 0.8.5
    Pympler = 0.4.3 Pympler = 0.4.3
    StructuredText = 2.11.1 StructuredText = 2.11.1
    WSGIUtils = 0.7 WSGIUtils = 0.7
    erp5diff = 0.8.1.7 erp5diff = 0.8.1.8
    five.formlib = 1.0.4 five.formlib = 1.0.4
    five.localsitemanager = 2.0.5 five.localsitemanager = 2.0.5
    google-api-python-client = 1.6.1 google-api-python-client = 1.6.1
    ...@@ -756,7 +754,7 @@ urlnorm = 1.1.4 ...@@ -756,7 +754,7 @@ urlnorm = 1.1.4
    uuid = 1.30 uuid = 1.30
    validictory = 1.1.0 validictory = 1.1.0
    xfw = 0.10 xfw = 0.10
    xupdate-processor = 0.4 xupdate-processor = 0.5
    selenium = 3.14.1 selenium = 3.14.1
    scikit-image = 0.14.0 scikit-image = 0.14.0
    PyWavelets = 0.5.2 PyWavelets = 0.5.2
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7