Commit 2e2ead59 by Taylor Otwell

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

parents dff91c9f 685e3cf0
......@@ -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"
......
......@@ -26,7 +26,7 @@ return [
|
*/
'default' => 'mysql',
'default' => env('DB_CONNECTION','mysql'),
/*
|--------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment