Merge branch 'develop' of github.com:laravel/laravel into develop

2015-05-26 16:15:35 -05:00 · 2015-05-26 16:15:35 -05:00 · 2e2ead5915
parent dff91c9f44 685e3cf0fa
commit 2e2ead5915
2 changed files with 2 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -8,6 +8,7 @@
 		"laravel/framework": "5.1.*"
 	},
 	"require-dev": {
+		"fzaninotto/faker": "~1.4",
 		"mockery/mockery": "0.9.*",
 		"phpunit/phpunit": "~4.0",
 		"phpspec/phpspec": "~2.1"
--- a/config/database.php
+++ b/config/database.php
@ -26,7 +26,7 @@
    |
    */

-    'default' => 'mysql',
+    'default' => env('DB_CONNECTION','mysql'),

    /*
    |--------------------------------------------------------------------------