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

Skip to content
Commit 9e6abf5f authored by Joe Steele's avatar Joe Steele
Browse files

Merge branch 'cert_validation' of git://github.com/k9mail/k-9.git into cert_validation 

Conflicts:
	tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java
parents 0f39a9d5 5f38306a
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