aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-06-18 10:35:50 +0200
committerMario <mario@mariovavti.com>2019-06-18 10:35:50 +0200
commitfc2a038ee1ba366d8ed3d6e301e8de3b05290889 (patch)
tree612d3818ba069e1a54023ec6dd5020269eee6f69 /Zotlabs/Lib
parent619b39f9553db3f88b5a8061c423f1eee37bdd3b (diff)
parentbecaa3b920bfe87c031c01bdf35d35db5c82e31e (diff)
downloadvolse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.tar.gz
volse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.tar.bz2
volse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.zip
Merge branch 'dev' into 'dev'
minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Activity.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 2998dbe98..0808fe33f 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -151,7 +151,6 @@ class Activity {
static function fetch_image($x) {
-
$ret = [
'type' => 'Image',
'id' => $x['id'],