From: Niki Roo <niki@nikiroo.be>
Date: Fri, 10 Apr 2020 17:49:41 +0000 (+0200)
Subject: Merge branch 'master' into subtree
X-Git-Tag: fanfix-3.1.2~20^2~15
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=8a3548eba34084768ad54c08866d94b17a250542;p=fanfix.git

Merge branch 'master' into subtree
---

8a3548eba34084768ad54c08866d94b17a250542