From: VirtualTam <virtualtam@flibidi.net>
Date: Tue, 22 Aug 2017 23:26:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/v0.9' into latest
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=2c049b673acdd10125db9c3c271eef5bd3f5fc17;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'upstream/v0.9' into latest

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
---

2c049b673acdd10125db9c3c271eef5bd3f5fc17