Merge branch 'develop' into feature/admin-retheme

This commit is contained in:
Dane Everitt 2017-03-03 17:30:51 -05:00
commit b301b89459
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53

View file

@ -55,6 +55,7 @@ return [
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),