diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-05 02:25:22 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-05 02:25:22 +0400 |
| commit | f4e94a46cb7d25da899c460840d9327e2542af5e (patch) | |
| tree | 7b344ce3fb7fc0145b6e58cccc60ef876e213122 /config | |
| parent | 99a0581140a2b9e172480a1ed7de21789cdc9b7b (diff) | |
| parent | 3b5d5a2b327c9b9819775f450e5527fdf779a5ad (diff) | |
Merge branch 'stable5' of github.com:owncloud/core into stable5
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 65d7aeb0852..5c09269ea3c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -56,7 +56,10 @@ $CONFIG = array( /* Theme to use for ownCloud */ "theme" => "", -/* Path to the 3rdparty directory */ +/* Optional ownCLoud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the users's language preference configured under "personal -> language" once they have logged in */ +"default_language" => "en", + +/* Path to the parent directory of the 3rdparty directory */ "3rdpartyroot" => "", /* URL to the 3rdparty directory, as seen by the browser */ @@ -144,7 +147,7 @@ $CONFIG = array( /* Enable/disable X-Frame-Restriction */ /* HIGH SECURITY RISK IF DISABLED*/ "xframe_restriction" => true, - + /* The directory where the user data is stored, default to data in the owncloud * directory. The sqlite database is also stored here, when sqlite is used. */ |