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/2.5' into release/2.6

Browse Source 
# Conflicts:
#	composer.json
#	setup/setuputils.class.inc.php
This commit is contained in:
Pierre Goiffon
2018-12-17 17:04:39 +01:00
parent cbc9784d21 faba67b292
commit b880ca05a5
25 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -10,7 +10,8 @@
"ext-zip": "*",
"ext-mysqli": "*",
"ext-dom": "*",
"ext-iconv": "*"
"ext-iconv": "*",
"ext-gd": "*"
},
"config": {
"platform": {