Merge branch 'main' into 'dev/beta-user'
# Conflicts: # .gitignore # .gitlab-ci.yml # appinfo/routes.php # lib/Controller/ShopAccountController.php # lib/Listeners/BeforeUserDeletedListener.php # lib/Service/ShopAccountService.php # lib/Settings/Personal.php