Merge branch 'main' into 'dev/php-lint-experiment'
# Conflicts: # lib/Controller/EmailRecoveryController.php
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
# Conflicts: # lib/Controller/EmailRecoveryController.php