Merging gitignore.

This commit is contained in:
Abijeet 2016-11-29 00:24:15 +05:30
parent d2efc2f47f
commit 581881d0ca
2 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@
return [ return [
'env' => env('APP_ENV', 'production'), 'env' => env('APP_ENV', 'development'),
'editor' => env('APP_EDITOR', 'html'), 'editor' => env('APP_EDITOR', 'html'),
@ -18,7 +18,7 @@ return [
| |
*/ */
'debug' => env('APP_DEBUG', false), 'debug' => env('APP_DEBUG', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -71,9 +71,9 @@ return [
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'), 'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'), 'database' => env('DB_DATABASE', 'bookstack'),
'username' => env('DB_USERNAME', 'forge'), 'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', 'Change123'),
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',