Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2014-04-11 17:17:20 -05:00
23 changed files with 38 additions and 25 deletions

View File

@@ -54,6 +54,19 @@ return array(
'locale' => 'en',
/*
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
'fallback_locale' => 'en',
/*
|--------------------------------------------------------------------------
| Encryption Key