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

Skip to content
Commit 5e5e75d8 authored by danapple's avatar danapple
Browse files

Merge branch 'master' of github.com:k9mail/k-9 

Conflicts:
	res/values/strings.xml
parents 1a24609a da34a5ec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment