]> git.mxchange.org Git - friendica.git/commit
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)
commita01872a117208aebb2925cb9cdc6449dced94094
tree135db039c1a72874fc0104fc8c8a9bf697610fd0
parent719c294fb535c8aa2639d627b97298d0e9f8cbec
parenta60467ed785471911ac5253a8242ba6d135e5e04
Merge branch 'develop' into show_image_upload_limit

# Conflicts:
# src/Util/Strings.php
# view/lang/C/messages.po
src/Module/Admin/Site.php
src/Util/Strings.php
view/lang/C/messages.po