Merge branch 'develop' into feature/vuejs
This commit is contained in:
commit
b6205463db
33 changed files with 797 additions and 246 deletions
|
@ -78,7 +78,7 @@ class SettingsServiceProvider extends ServiceProvider
|
|||
return [$setting->key => $setting->value];
|
||||
})->toArray();
|
||||
} catch (QueryException $exception) {
|
||||
$log->notice('A query exception was encountered while trying to load settings from the database.');
|
||||
$log->notice('A query exception was encountered while trying to load settings from the database: ' . $exception->getMessage());
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue