aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/defaults.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-07 17:10:45 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-07 17:10:45 +0200
commit78e5410199559c37efff0c0d6851fd1555a39beb (patch)
treebb240eb277fc987ad19719b7e49e018262bf29d1 /lib/private/defaults.php
parentd7bc23e16d54ea1f3c24fc9ec2297f6dcd7d856b (diff)
parent1e559f72391b51089674e68871bf2502a5e5c75e (diff)
downloadnextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.tar.gz
nextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.zip
Merge branch 'master' into jshint-globals-oc-t-n
Conflicts: .jshintrc
Diffstat (limited to 'lib/private/defaults.php')
-rw-r--r--lib/private/defaults.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 79be211b82f..fca798568c5 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -29,8 +29,8 @@ class OC_Defaults {
$this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
$this->defaultName = "ownCloud"; /* short name, used when referring to the software */
$this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */
- $this->defaultBaseUrl = "http://owncloud.org";
- $this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
+ $this->defaultBaseUrl = "https://owncloud.org";
+ $this->defaultSyncClientUrl = "https://owncloud.org/sync-clients/";
$this->defaultDocBaseUrl = "http://doc.owncloud.org";
$this->defaultSlogan = $this->l->t("web services under your control");
$this->defaultLogoClaim = "";