composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-29 21:48:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	lib/composer/installed.php
This commit is contained in:
Pierre Goiffon
2023-12-08 11:33:23 +01:00
parent 45a806ac77 3f8017f43d
commit 8e2e155e65
7 changed files with 390 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/composer/installed.php
View File

@@ -3,7 +3,7 @@
'name' => 'combodo/itop',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '4fb581c784061ae348ea6d19e70248ec1bfeb310',
'reference' => '7d3ff60eb26aec3f18c9cd88dc7e7ebcd1f93a52',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -22,7 +22,7 @@
'combodo/itop' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '4fb581c784061ae348ea6d19e70248ec1bfeb310',
'reference' => '7d3ff60eb26aec3f18c9cd88dc7e7ebcd1f93a52',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),