diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-03 06:43:11 +0400 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-03 06:43:11 +0400 |
| commit | 65413a95dcffee0d803dd30c9cd0028eb9c113e5 (patch) | |
| tree | 5e51e6da3aa76f69c0045fe5ed6b2b20f7226a1f /config | |
| parent | e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2 (diff) | |
| parent | 431cf06e996dad7af99b4c65678e5793bd682850 (diff) | |
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index a9ce48a4e9d..29085af4716 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -71,9 +71,6 @@ $CONFIG = array( /* Enable the help menu item in the settings */ "knowledgebaseenabled" => true, -/* URL to use for the help page, server should understand OCS */ -"knowledgebaseurl" => "http://api.apps.owncloud.com/v1", - /* Enable installing apps from the appstore */ "appstoreenabled" => true, @@ -217,4 +214,9 @@ $CONFIG = array( /* whether avatars should be enabled */ 'enable_avatars' => true, + +// Extra SSL options to be used for configuration +'openssl' => array( + //'config' => '/absolute/location/of/openssl.cnf', +), ); |