aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-20 21:46:33 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-20 21:46:33 +0200
commit985fb44424a8f321b77ed96466190e5fdeca34d6 (patch)
tree42533054e6b4ee183dc553754bb4fd08bd1265c1 /Zotlabs
parentcc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff)
parent17c5502330136bf429556935fef956781edb865f (diff)
downloadvolse-hubzilla-985fb44424a8f321b77ed96466190e5fdeca34d6.tar.gz
volse-hubzilla-985fb44424a8f321b77ed96466190e5fdeca34d6.tar.bz2
volse-hubzilla-985fb44424a8f321b77ed96466190e5fdeca34d6.zip
Merge branch 'master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/XConfig.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
index e28dcf559..7f3d0f2cd 100644
--- a/Zotlabs/Lib/XConfig.php
+++ b/Zotlabs/Lib/XConfig.php
@@ -122,7 +122,7 @@ class XConfig {
);
}
- App::$config[$xchan][$family][$key] = $value;
+ \App::$config[$xchan][$family][$key] = $value;
if($ret)
return $value;
@@ -157,4 +157,4 @@ class XConfig {
return $ret;
}
-} \ No newline at end of file
+}