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

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

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-oauth-client/vendor/composer/installed.php
This commit is contained in:
Eric Espie
2022-11-24 14:37:35 +01:00
parent 8db89c3d5f 6a0cdb8705
commit ebf3f48584
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-oauth-client/vendor/composer/installed.php vendored
View File

@@ -5,7 +5,7 @@
'type' => 'itop-extension', 'type' => 'itop-extension',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
'reference' => '5a1627632aa2e605996c1c556c60c2a2cddc0a05', 'reference' => '8db89c3d5f5f88d80780db8acb5147ba0d95c42f',
'name' => 'combodo/itop-oauth-client', 'name' => 'combodo/itop-oauth-client',
'dev' => true, 'dev' => true,
), ),
@@ -16,7 +16,7 @@
'type' => 'itop-extension', 'type' => 'itop-extension',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
'reference' => '5a1627632aa2e605996c1c556c60c2a2cddc0a05', 'reference' => '8db89c3d5f5f88d80780db8acb5147ba0d95c42f',
'dev_requirement' => false, 'dev_requirement' => false,
), ),
), ),