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

# Conflicts:
#	application/transaction.class.inc.php
#	application/ui.extkeywidget.class.inc.php
#	composer.json
#	composer.lock
#	js/utils.js
#	lib/composer/InstalledVersions.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/pear/archive_tar/Archive/Tar.php
#	lib/pear/archive_tar/package.xml
#	setup/wizardsteps.class.inc.php
#	sources/Controller/AjaxRenderController.php

2021-10-18 14:57:19 +02:00

2.5 KiB

Raw Blame History

View Raw