summaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-22 22:59:09 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-22 22:59:09 +0100
commit9898ba4daf1acdead2ed5fa6024e779caafb353e (patch)
tree3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df /lib/setup.php
parent5062ae250b767867609f64c29ab4cde65f022b75 (diff)
parent78fce834058a38a7dbcc5310e16095c743434bc6 (diff)
downloadnextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.tar.gz
nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.zip
Merge branch 'master' into master-sqlserver
Conflicts: core/templates/installation.php
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/setup.php b/lib/setup.php
index 21bf928efe4..fd5f3cd5bee 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -846,8 +846,7 @@ class OC_Setup {
header("Location: ".OC::$WEBROOT.'/');
} else {
- $error = $l->t('Your web server is not yet properly setup to allow files'
- .' synchronization because the WebDAV interface seems to be broken.');
+ $error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.');
$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.',
'http://doc.owncloud.org/server/5.0/admin_manual/installation.html');