From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 7 Oct 2017 10:22:54 +0000 (+0200)
Subject: Merge branch 'master' into v0.9
X-Git-Tag: v0.9.2~1
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=80b15f5d2db8b90fd9b29f94e6bd8652340df4f0

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

80b15f5d2db8b90fd9b29f94e6bd8652340df4f0