Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit f954bbf4 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'main' into 'dev/recovery-code-duplication' 

# Conflicts:
#   lib/Service/RecoveryEmailService.php
parents e5a42885 35404057