aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-20 13:42:51 -0700
committerredmatrix <git@macgirvin.com>2016-06-20 13:42:51 -0700
commit76f07a7f97a255989870101f77c3069266d3205a (patch)
treecb0585ae6721c003df51942c2ae157522769d9d0
parent4d219df04e72794ccd02ce44578485814829ea5e (diff)
parent17c5502330136bf429556935fef956781edb865f (diff)
downloadvolse-hubzilla-76f07a7f97a255989870101f77c3069266d3205a.tar.gz
volse-hubzilla-76f07a7f97a255989870101f77c3069266d3205a.tar.bz2
volse-hubzilla-76f07a7f97a255989870101f77c3069266d3205a.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
-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
+}