From: Niki Roo <niki@nikiroo.be>
Date: Fri, 12 Apr 2019 07:36:35 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Tag: fanfix-3.0.0~130
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=7879b47fdbdcaf465327bcbee53a7e31331feb97;p=fanfix.git

Merge branch 'master' into search
---

7879b47fdbdcaf465327bcbee53a7e31331feb97