From: Abijeet Patro <redacted>
Date: Sat, 25 Mar 2017 18:26:05 +0000 (+0530)
Subject: Merge pull request #8 from BookStackApp/master
X-Git-Tag: v0.18.0~1^2~45^2^2~31^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4e71a5a47b97bee59b8afff98b510c4d0d7ead15?ds=inline;hp=-c

Merge pull request #8 from BookStackApp/master

Getting the latest changes.
---

4e71a5a47b97bee59b8afff98b510c4d0d7ead15
diff --combined config/database.php
index cfeeaa75a,92c768245..d13268cea
--- a/config/database.php
+++ b/config/database.php
@@@ -71,9 -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'    => '',
@@@ -82,7 -82,7 +82,7 @@@
  
          'mysql_testing' => [
              'driver'    => 'mysql',
-             'host'      => 'localhost',
+             'host'      => '127.0.0.1',
              'database'  => 'bookstack-test',
              'username'  => env('MYSQL_USER', 'bookstack-test'),
              'password'  => env('MYSQL_PASSWORD', 'bookstack-test'),