Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

This commit is contained in:
redmatrix 2016-06-20 13:42:51 -07:00
commit 76f07a7f97

View File

@ -122,7 +122,7 @@ class XConfig {
); );
} }
App::$config[$xchan][$family][$key] = $value; \App::$config[$xchan][$family][$key] = $value;
if($ret) if($ret)
return $value; return $value;
@ -157,4 +157,4 @@ class XConfig {
return $ret; return $ret;
} }
} }