Commit 3e7fa910 authored by Jérome Perrin's avatar Jérome Perrin

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

parents 9e9e4507 776d4d77
Pipeline #23974 failed with stage
in 0 seconds