Merge branch 'main' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud...

Merge branch 'main' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud into dev/email-template-mod