From: Niki Roo <niki@nikiroo.be>
Date: Sat, 13 Apr 2019 11:33:46 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Tag: fanfix-3.0.0~124
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e39e560faae7c7bf3cf6fb098be5c4b209ac29e3;p=fanfix.git

Merge branch 'master' into search
---

e39e560faae7c7bf3cf6fb098be5c4b209ac29e3