Commit 12bb7b37 authored by Jérome Perrin's avatar Jérome Perrin

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

parents c71a47c8 f3dc7d8b
Pipeline #23767 failed with stage
in 0 seconds