deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-05-10 09:46:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse source
This commit is contained in:
Jakub Turek 2015-02-19 20:29:59 +01:00
parent 8a9aee4395 bb9e842bd5
commit c64364ce60
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/mage
View file

@ -18,6 +18,8 @@ define('MAGALLANES_DIRECTORY', $baseDir);
if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
require_once __DIR__ . '/../vendor/autoload.php';
} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
require_once __DIR__ . '/../../../autoload.php';
} else {
require_once $baseDir . '/Mage/Autoload.php';
$loader = new \Mage\Autoload();

4
composer.json
View file

@ -14,8 +14,8 @@
"autoload": {
"psr-4": {
"Mage\\": "./Mage",
"Task\\": ".mage/tasks",
"Command\\": ".mage/commands"
"Task\\": [".mage/tasks", "../../../.mage/tasks"],
"Command\\": [".mage/tasks", "../../../.mage/commands"]
}
},
"config": {