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

Skip to content
Commit 4c78d12f authored by Dominik Schürmann's avatar Dominik Schürmann
Browse files

Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view 

Conflicts:
	k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
parents e3fef1af 581d32ac
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