aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
commit5445b94416f50bb040e7426cadfa458607893f07 (patch)
tree337b12362333030e0ebda37acb7f25073723a7af /apps/files_external/lib
parent7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff)
parent1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff)
downloadnextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz
nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip
merge master into filesystem
Diffstat (limited to 'apps/files_external/lib')
-rwxr-xr-xapps/files_external/lib/config.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 3bb512493d8..6b0df21461b 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -103,7 +103,7 @@ class OC_Mount_Config {
'user' => 'Username',
'password' => '*Password',
'root' => '&Root',
- 'secure' => '!Secure https://'));
+ 'secure' => '!Secure https://'));
return($backends);
}
@@ -374,7 +374,7 @@ class OC_Mount_Config {
}
/**
- * check if smbclient is installed
+ * check if smbclient is installed
*/
public static function checksmbclient() {
if(function_exists('shell_exec')) {
@@ -386,7 +386,7 @@ class OC_Mount_Config {
}
/**
- * check if php-ftp is installed
+ * check if php-ftp is installed
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {