aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-22 03:51:58 -0700
committerzotlabs <mike@macgirvin.com>2017-05-22 03:51:58 -0700
commit1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d (patch)
tree30f9100f61e54bd800d859af3dc45dcab56e5cee /Zotlabs/Lib
parent36a960adec9f216463890640340324d6d37a65d0 (diff)
parent50e9d024581ddf57f37a6302bc089a88237657bb (diff)
downloadvolse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.gz
volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.bz2
volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Apps.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index ed18ff3cb..06ec7c39d 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -666,9 +666,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);