Merge branch 'master' of github.com:joshtronic/pickles

This commit is contained in:
Josh Sherman 2014-09-23 07:23:36 -04:00
commit 55f45b8d8f
2 changed files with 28 additions and 31 deletions

View file

@ -123,9 +123,6 @@ $config = Config::getInstance();
// Injects PICKLES variables into the config
$config->data['pickles']['path'] = dirname(__FILE__) . '/';
// Requires the Composer autoloader
require_once $config->pickles['path'] . '../vendor/autoload.php';
// Configures any available PHP configuration options
if (is_array($config->php) && count($config->php))
{