aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRobin <robin@Amaya.(none)>2010-04-19 19:46:42 +0200
committerRobin <robin@Amaya.(none)>2010-04-19 19:46:42 +0200
commit38bdf4083a6e0d90afb35ded0d67cab8a518b2ea (patch)
tree10a29805a025802c6dc12c2c65c18a48cb2742f7 /settings
parent6591740f5dd73969458de9a586790922fe6c27ea (diff)
downloadnextcloud-server-38bdf4083a6e0d90afb35ded0d67cab8a518b2ea.tar.gz
nextcloud-server-38bdf4083a6e0d90afb35ded0d67cab8a518b2ea.zip
same fixes, this time hopefully without merge conflict
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/index.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/settings/index.php b/settings/index.php
index 7cdb993e45e..d5e7451d08b 100755
--- a/settings/index.php
+++ b/settings/index.php
@@ -21,6 +21,7 @@
*
*/
+$CONFIG_ERROR='';
require_once('../inc/lib_base.php');