From: Niki Roo <niki@nikiroo.be>
Date: Tue, 26 May 2020 19:06:50 +0000 (+0200)
Subject: Merge commit '712ddafb749aada41daab85c36ac12f657b2307e'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=8364d9cdf59ca464c27451755460dd8093d72c87;hp=5a6481dc6e87db089f93ef04bd03686916d42a88

Merge commit '712ddafb749aada41daab85c36ac12f657b2307e'
---