Skip to content
Permalink
Browse files

Merge 08a293f into dd79eca

  • Loading branch information
1ma committed Mar 18, 2016
2 parents dd79eca + 08a293f commit 74a71c22f26668ffaa0c142f7a1a659a2303d34b
Showing with 54 additions and 39 deletions.
  1. +4 −4 bin/mage
  2. +50 −35 composer.lock
@@ -22,12 +22,12 @@ 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();
spl_autoload_register(array($loader, 'autoLoad'));
}

require_once $baseDir . '/Mage/Autoload.php';
$loader = new \Mage\Autoload();
spl_autoload_register(array($loader, 'autoLoad'));

// Clean arguments
array_shift($argv);

Some generated files are not rendered by default. Learn more.

0 comments on commit 74a71c2

Please sign in to comment.
You can’t perform that action at this time.