]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into show_image_upload_limit
authorMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Sun, 27 Nov 2022 22:52:58 +0000 (23:52 +0100)
committerMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Sun, 27 Nov 2022 22:52:58 +0000 (23:52 +0100)
# Conflicts:
# src/Util/Strings.php
# view/lang/C/messages.po

1  2 
src/Module/Admin/Site.php
src/Util/Strings.php
view/lang/C/messages.po

Simple merge
Simple merge
Simple merge