mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-03 07:28:57 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # composer.json # composer.lock # core/email.class.inc.php # css/ui-lightness/jqueryui.scss # lib/bin/php-parse # lib/bin/php-parse.bat # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/composer/platform_check.php # lib/nikic/php-parser/grammar/php7.y # lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Builder/Param.php # lib/nikic/php-parser/lib/PhpParser/Builder/Property.php # lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php # lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php # lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php # lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php # lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Param.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php # lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php # lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php # lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php # test/core/ConfigValidator/iTopConfigAstValidatorTest.php
This commit is contained in:
@@ -2,16 +2,20 @@
|
||||
|
||||
// autoload_files.php @generated by Composer
|
||||
|
||||
$vendorDir = dirname(dirname(__FILE__));
|
||||
$vendorDir = dirname(__DIR__);
|
||||
$baseDir = dirname($vendorDir);
|
||||
|
||||
return array(
|
||||
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
|
||||
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
|
||||
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
|
||||
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
|
||||
'023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
|
||||
'32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
|
||||
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
|
||||
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
|
||||
'25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
|
||||
'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
|
||||
'32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
|
||||
'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
|
||||
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
|
||||
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user