From: Paul <paul@claws-mail.org>
Date: Fri, 25 Sep 2020 06:15:38 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
X-Git-Tag: 3.17.7~4
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2b4c50c9800fefb5f2f11491985dc215d7e34ead

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
---

2b4c50c9800fefb5f2f11491985dc215d7e34ead