Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-04-15 08:35:19 -05:00
commit cfd7b5842d
3 changed files with 20 additions and 2 deletions

2
.gitignore vendored
View File

@ -2,7 +2,7 @@
/vendor
composer.phar
composer.lock
.env.local.php
.env.*.php
.env.php
.DS_Store
Thumbs.db

View File

@ -13,7 +13,7 @@
|
*/
'debug' => true,
'debug' => false,
/*
|--------------------------------------------------------------------------

18
app/config/local/app.php Normal file
View File

@ -0,0 +1,18 @@
<?php
return array(
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
'debug' => true,
);