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

Skip to content
Commit 807907cb authored by cketti's avatar cketti
Browse files

Merge branch 'master' into issue549 

Conflicts:
	res/values/strings.xml
	src/com/fsck/k9/service/MailService.java
parents ae465789 f345c337
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