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

Skip to content
Commit af445f60 authored by Mathew Smith's avatar Mathew Smith
Browse files

Merge branch 'e-5.734' into e-5.800 

# Conflicts:
#	README.md
#	app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
#	app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
#	app/ui/legacy/src/main/res/values/strings.xml
parents db791745 5baff723