From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 12 Nov 2020 12:02:36 +0000 (+0100)
Subject: Merge branch 'master' into v0.12
X-Git-Tag: v0.12.1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=refs%2Ftags%2Fv0.12.1;p=github%2Fshaarli%2FShaarli.git

Merge branch 'master' into v0.12
---

1409f1c89a7ca01456ae2dcd6357d296e2b99f5a