aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-23 16:14:41 -0700
committerzotlabs <mike@macgirvin.com>2017-05-23 16:14:41 -0700
commitbf580fcc0651663031d74072ee17a8f6becb49fc (patch)
treeaaf0ac6129053c728f29559381f521395494f0b8 /Zotlabs
parent357e7af6adb303aa12f6506585e7d59a1250da99 (diff)
parent31d920817264552cece5a57c2390411af4d7a3a1 (diff)
downloadvolse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.tar.gz
volse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.tar.bz2
volse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index df5fb4aec..68587df49 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -665,8 +665,6 @@ class Apps {
}
-
-
static public function app_decode($s) {
$x = base64_decode(str_replace(array('<br />',"\r","\n",' '),array('','','',''),$s));
return json_decode($x,true);