Commit 2f0563c3 authored by Jérome Perrin's avatar Jérome Perrin

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

parents cd26fb52 bdc6e1a7
Pipeline #23722 failed with stage
in 0 seconds