Merge branch 'staging'

This commit is contained in:
Taylor Otwell
2012-08-28 23:56:42 -05:00
11 changed files with 307 additions and 119 deletions

View File

@@ -94,6 +94,19 @@ return array(
'language' => 'en',
/*
|--------------------------------------------------------------------------
| Supported Languages
|--------------------------------------------------------------------------
|
| These languages may also be supported by your application. If a request
| enters your application with a URI beginning with one of these values
| the default language will automatically be set to that language.
|
*/
'languages' => array(),
/*
|--------------------------------------------------------------------------
| SSL Link Generation