Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2018-09-23 13:14:46 -07:00
commit b6205463db
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 797 additions and 246 deletions

View file

@ -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;
}