From: VirtualTam <virtualtam@flibidi.net>
Date: Tue, 22 Aug 2017 23:08:41 +0000 (+0200)
Subject: Merge branch 'master' into v0.9
X-Git-Tag: v0.9.1~1
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=9d7a02afcee3c740712a7c95182d332db0504b7e

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

9d7a02afcee3c740712a7c95182d332db0504b7e