Commit 2fbf01f3 authored by Tobias Munk's avatar Tobias Munk

fixed new-line, removed file check

parent 2d5bccb0
......@@ -10,4 +10,5 @@ yii db/create
yii migrate --interactive=0 --migrationLookup=${APP_MIGRATION_LOOKUP}
yii app/setup-admin-user --interactive=0
echo "\nApplication initialized."
echo ""
echo "Application initialized."
......@@ -243,11 +243,8 @@ if (YII_ENV_DEV || YII_ENV_TEST) {
'allowedIPs' => $allowedIPs,
];
if (file_exists(__DIR__.'/giiant.php')) {
// Local configuration, if available
$giiant = require __DIR__.'/giiant.php';
$config = \yii\helpers\ArrayHelper::merge($config, $giiant);
}
$giiant = require __DIR__.'/giiant.php';
$config = \yii\helpers\ArrayHelper::merge($config, $giiant);
}
if (file_exists(getenv('APP_CONFIG_FILE'))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment