Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Taylor Otwell 2015-05-26 16:15:35 -05:00
parent dff91c9f44 685e3cf0fa
commit 2e2ead5915
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -8,6 +8,7 @@
"laravel/framework": "5.1.*" "laravel/framework": "5.1.*"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1" "phpspec/phpspec": "~2.1"

2
config/database.php
View File

@ -26,7 +26,7 @@
| |
*/ */
'default' => 'mysql', 'default' => env('DB_CONNECTION','mysql'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------