mirror of https://github.com/moparisthebest/k-9
7752f42db6
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 |
||
---|---|---|
.. | ||
k9/mail |