From: Marek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Date: Mon, 5 Dec 2022 22:36:57 +0000 (+0100)
Subject: Merge branch 'develop' into new_image_presentation
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=76f4ba7685dc3c722464d3b5f8be8e1b08fef05a;p=friendica.git

Merge branch 'develop' into new_image_presentation

# Conflicts:
#	src/Object/Image.php
---

76f4ba7685dc3c722464d3b5f8be8e1b08fef05a