1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-10 19:45:05 -05:00
k-9/k9mail-library/src/main
cketti 23c9398c03 Merge branch 'master' into pgp_mime_preparations
Conflicts:
	k9mail/src/androidTest/java/com/fsck/k9/mailstore/LocalMessageTest.java
2015-01-20 18:35:07 +01:00
..
java/com/fsck/k9/mail Merge branch 'master' into pgp_mime_preparations 2015-01-20 18:35:07 +01:00
AndroidManifest.xml Move 'mail' package to library project 2014-12-20 01:31:33 +01:00