From: Marek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Date: Sun, 27 Nov 2022 22:52:58 +0000 (+0100)
Subject: Merge branch 'develop' into show_image_upload_limit
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a01872a117208aebb2925cb9cdc6449dced94094;p=friendica.git

Merge branch 'develop' into show_image_upload_limit

# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
---

a01872a117208aebb2925cb9cdc6449dced94094