Marek Bachmann a01872a117 Merge branch 'develop' into show_image_upload_limit ...

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

2022-11-27 23:52:58 +01:00

..

messages.po

Merge branch 'develop' into show_image_upload_limit

2022-11-27 23:52:58 +01:00