ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Chris Berthe
2012-07-12 11:15:43 -04:00
parent 3b6191ec16 1503aed7ce
commit b325e954e3
25 changed files with 538 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/config/application.php
View File

@@ -84,7 +84,7 @@ return array(
/*
|--------------------------------------------------------------------------
| Application Language
| Default Application Language
|--------------------------------------------------------------------------
|
| The default language of your application. This language will be used by
@@ -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