composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
#	lib/autoload.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
#	lib/true/punycode/LICENSE
#	sources/Composer/iTopComposer.php
This commit is contained in:
Pierre Goiffon
2022-05-02 14:32:49 +02:00
parent 32ed40e733 603934bac1
commit 197bad19ab
63 changed files with 2578 additions and 8667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -16,7 +16,7 @@
"nikic/php-parser": "~4.13.2",
"pear/archive_tar": "~1.4.14",
"pelago/emogrifier": "~3.1.0",
"scssphp/scssphp": "~1.10.2",
"scssphp/scssphp": "1.0.6",
"symfony/console": "~3.4.47",
"symfony/dotenv": "~3.4.47",
"symfony/framework-bundle": "~3.4.47",