summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJesus Macias Portela <jesus.macias.portela@gmail.com>2015-12-03 12:35:49 +0100
committerJesus Macias Portela <jesus.macias.portela@gmail.com>2015-12-03 12:35:49 +0100
commitdcfbbe4737e9939b6c038f8e48b49957c66a52e8 (patch)
tree8163f2d7537708d7d5486a093bb3dab9cc63f9d2 /config
parenta79ae4ae086c08c75a6d974966458251e2167347 (diff)
parente62b6c1617886b2cdd7553ea9b119c431e4eb363 (diff)
downloadnextcloud-server-dcfbbe4737e9939b6c038f8e48b49957c66a52e8.tar.gz
nextcloud-server-dcfbbe4737e9939b6c038f8e48b49957c66a52e8.zip
Merge branch 'master' into issue_20427
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 02e5aba3e94..034a1ebddbf 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -213,7 +213,6 @@ $CONFIG = array(
)
),
-
/**
* Mail Parameters
*