composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-05 00:54:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,170 Commits 155 Branches 134 Tags
347cbca5cfe608b7eec8f99e83c6bafbe0ccc471
Commit Graph

3 Commits

Author SHA1 Message Date
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
Pierre Goiffon
8ea5be4ead Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	application/transaction.class.inc.php
 2021-10-18 14:32:27 +02:00
Pierre Goiffon
b3f827ed5e N°4367 Security hardening 2021-10-18 14:27:58 +02:00