moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity
5,369 Commits 36 Branches 329 Tags 887 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
cketti 4f8fc5bc5b Merge remote-tracking branch 'k9mail_pgp_mime/master' 
Fixed lots of conflicts
 2014-12-20 08:07:46 +01:00
cketti 7752f42db6 Merge branch 'gradle_only_and_k9mail_library' 
Conflicts:
	k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java
	src/com/fsck/k9/mail/store/imap/ImapSettings.java
	src/com/fsck/k9/mail/transport/imap/ImapSettings.java
 2014-12-20 04:46:14 +01:00
cketti 105bca735b Move 'mail' package to library project 2014-12-20 01:31:33 +01:00