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

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

Browse Source 
# Conflicts:
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
This commit is contained in:
Pierre Goiffon
2022-09-21 14:28:25 +02:00
parent fac455da48 a5b5518533
commit e4f6a02de6
16 changed files with 132 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composer/autoload_psr4.php
View File

@@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(