Merge remote-tracking branch 'upstream/master'

README.md

data/Dockerfiles/sogo/navMailcowBtns.diff

data/conf/dovecot/auth/mailcowauth.php

data/conf/dovecot/auth/passwd-verify.lua

data/conf/dovecot/dovecot.conf

data/conf/phpfpm/crons/keycloak-sync.php

data/conf/phpfpm/crons/ldap-sync.php

data/conf/postfix/postscreen_access.cidr

data/conf/sogo/custom-sogo.js

data/web/inc/functions.auth.inc.php

data/web/inc/functions.inc.php

data/web/js/site/admin.js

data/web/js/site/user.js

data/web/lang/lang.de-de.json

data/web/lang/lang.en-gb.json

data/web/reset-password.php

data/web/templates/admin/tab-config-identity-provider.twig

data/web/templates/user/tab-user-auth.twig

docker-compose.yml

helper-scripts/backup_and_restore.sh