From: Mark Schmitz <kramred@gmail.com>
Date: Thu, 7 Jun 2018 13:23:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.10.0~21^2~1
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=0deaedeeaef088040fb015f5be3e270e3bae508e

Merge remote-tracking branch 'upstream/master'
---

0deaedeeaef088040fb015f5be3e270e3bae508e