Merge branch 'dev' into 'dev'

minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671
2019-06-18 10:35:50 +02:00
parent 619b39f955 becaa3b920
commit fc2a038ee1
3 changed files with 3 additions and 3 deletions
--- 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'],