From: Abijeet <redacted>
Date: Mon, 28 Nov 2016 18:54:15 +0000 (+0530)
Subject: Merging gitignore.
X-Git-Tag: v0.18.0~1^2~45^2^2~37
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/581881d0cae139bb634288590ae949270c39d715

Merging gitignore.
---

diff --git a/config/app.php b/config/app.php
index 786f005ac..d94196cc1 100644
--- a/config/app.php
+++ b/config/app.php
@@ -3,7 +3,7 @@
 return [
 
 
-    'env' => env('APP_ENV', 'production'),
+    'env' => env('APP_ENV', 'development'),
 
     'editor' => env('APP_EDITOR', 'html'),
 
@@ -18,7 +18,7 @@ return [
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => env('APP_DEBUG', true),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/database.php b/config/database.php
index 832852dc2..cfeeaa75a 100644
--- a/config/database.php
+++ b/config/database.php
@@ -71,9 +71,9 @@ return [
         'mysql' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST', 'localhost'),
-            'database'  => env('DB_DATABASE', 'forge'),
-            'username'  => env('DB_USERNAME', 'forge'),
-            'password'  => env('DB_PASSWORD', ''),
+            'database'  => env('DB_DATABASE', 'bookstack'),
+            'username'  => env('DB_USERNAME', 'root'),
+            'password'  => env('DB_PASSWORD', 'Change123'),
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',