From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 13 Oct 2020 09:49:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'parent/master' into v0.12
X-Git-Tag: v0.12.0~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e6678e07ca24b77ac951b615d53538c17f35df55;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'parent/master' into v0.12
---

e6678e07ca24b77ac951b615d53538c17f35df55