From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 3 Aug 2019 07:54:11 +0000 (+0200)
Subject: Merge branch 'master' into v0.11
X-Git-Tag: v0.11.1~1
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=58fa1a6ad1596c0b5425a48ca79f71d3791f6a92

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

58fa1a6ad1596c0b5425a48ca79f71d3791f6a92