Pierre Goiffon ddd6bf22af Merge remote-tracking branch 'origin/support/2.7' into develop ...

# Conflicts:
#	core/attributedef.class.inc.php
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	sources/Renderer/RenderingOutput.php
#	test/core/sanitizer/HTMLDOMSanitizerTest.php
#	test/integration/DictionariesConsistencyTest.php

2021-11-24 15:01:38 +01:00

14 KiB

Raw Blame History

View Raw