From: nodiscc <nodiscc@gmail.com>
Date: Sun, 17 Dec 2017 22:43:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'nerostie/patch-2' into doc-overhaul
X-Git-Tag: v0.9.4~21^2~3
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=5faa0697dd080acba0604adc57127674382f1ac7

Merge remote-tracking branch 'nerostie/patch-2' into doc-overhaul
---

5faa0697dd080acba0604adc57127674382f1ac7