timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e3d6ac20ea - Show all commits

2
composer.json
View File

@ -22,7 +22,7 @@
"aura/html": "^2.0", "aura/html": "^2.0",
"aura/router": "^3.0", "aura/router": "^3.0",
"aura/session": "^2.0", "aura/session": "^2.0",
"aviat/banker": "^1.0.0", "aviat/banker": "^2.0.0",
"aviat/ion": "^2.4.1", "aviat/ion": "^2.4.1",
"ext-iconv": "*", "ext-iconv": "*",
"ext-json": "*", "ext-json": "*",

6
index.php
View File

@ -47,12 +47,12 @@ $CONF_DIR = _dir($APP_DIR, 'config');
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Dependency Injection setup // Dependency Injection setup
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
$baseConfig = require $APPCONF_DIR . '/base_config.php'; $baseConfig = require "{$APPCONF_DIR}/base_config.php";
$di = require $APP_DIR . '/bootstrap.php'; $di = require "{$APP_DIR}/bootstrap.php";
$config = loadToml($CONF_DIR); $config = loadToml($CONF_DIR);
$overrideFile = $CONF_DIR . '/admin-override.toml'; $overrideFile = "{$CONF_DIR}/admin-override.toml";
$overrideConfig = file_exists($overrideFile) $overrideConfig = file_exists($overrideFile)
? loadTomlFile($overrideFile) ? loadTomlFile($overrideFile)
: []; : [];