Merge branch 'gradle_only_and_k9mail_library' (7752f42d) · Commits · e / os / Mail

Commit 7752f42d authored Dec 20, 2014 by cketti

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

parents ae6f1fa2 52b3974c

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment