[commit] master: Merge branch '1.3'

Skipped 2 existing revision(s) on branch 'master'. commit 062706fcbf39bcee536ea4b5c690e2f30e122faa Merge: fc300fd e4eac03 Author: Oswald Buddenhagen Date: Wed Feb 3 15:53:05 2021 +0100 Merge branch '1.3' Conflicts: configure.ac src/drv_imap.c src/drv_imap

[commit] master: Merge branch '1.3'

Skipped 7 existing revision(s) on branch 'master'. commit 5fee222f8408d5dd82b40d53c663b8ceffa13914 Merge: cab1460 c97e650 Author: Oswald Buddenhagen Date: Tue Aug 4 14:48:58 2020 +0200 Merge branch '1.3' src/drv_imap.c | 17 ++-- src/drv_proxy.c | 4 +++- src/mbsync.1|

[commit] master: Merge branch '1.3'

Skipped 14 existing revision(s) on branch 'master'. commit cab14608caa7b99478c86b526179b3990359ea1e Merge: e565d08 80deabf Author: Oswald Buddenhagen Date: Fri Nov 22 14:06:01 2019 +0100 Merge branch '1.3' Makefile.am | 5 +- README| 7 ++ TODO | 2 -

[commit] master: Merge branch '1.3'

Skipped 15 existing revision(s) on branch 'master'. commit 462fed556a4ccb57c1259570583d846d343cc628 Merge: a310e7e d0a8551 Author: Oswald Buddenhagen Date: Thu Oct 3 20:17:54 2019 +0200 Merge branch '1.3' configure.ac | 6 +-- src/common.h | 1 + src/drv_imap.c

[commit] master: Merge branch '1.3'

Skipped 6 existing revision(s) on branch 'master'. commit 95d18e2778f28b7aac4f92dc6770430ee7c7ca4b Merge: 37feedd acfa3a2 Author: Oswald Buddenhagen Date: Tue Nov 27 00:51:03 2018 +0100 Merge branch '1.3' src/driver.c | 9 src/driver.h | 1 + src/drv_imap.c | 56 ++

[commit] master: Merge branch '1.3'

Skipped 1 existing revision(s) on branch 'master'. commit 940cb3255139e97c0dec98416fa98962901f9a3e Merge: 37feedd 17babc1 Author: Oswald Buddenhagen Date: Sat Sep 8 18:48:05 2018 +0200 Merge branch '1.3' src/socket.c | 2 ++ 1 file changed, 2 insertions(+) = Full diff against 1st pa

[commit] master: Merge branch '1.3'

Skipped 2 existing revision(s) on branch 'master'. commit 3a7b4885278b1679e85020801391ba6c017c83a7 Merge: 940cb32 acfa3a2 Author: Oswald Buddenhagen Date: Mon Nov 26 22:50:39 2018 +0100 Merge branch '1.3' src/driver.c | 9 src/driver.h | 1 + src/drv_imap.c | 56 ++

[commit] master: Merge branch '1.3'

Skipped 4 existing revision(s) on branch 'master'. commit 37feeddbfb8d86fcd25f90c7928d5ea139b0feb4 Merge: c4d7f01 f698f16 Author: Oswald Buddenhagen Date: Sun Jul 1 13:26:10 2018 +0200 Merge branch '1.3' src/drv_imap.c| 14 ++ src/drv_maildir.c | 6 +++--- src/drv_proxy.

[commit] master: Merge branch '1.3'

Skipped 10 existing revision(s) on branch 'master'. commit 904858365d636d5d949253c6e6a18227249f8ef7 Merge: cbac8aa 5072032 Author: Oswald Buddenhagen Date: Sun Apr 8 18:17:10 2018 +0200 Merge branch '1.3' Conflicts: configure.ac .gitignore| 1 + configure.ac