From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 1 May 2017 20:15:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~114
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e1d64050ad6f54e45d3954ffac21daaee58c6240;hp=--cc;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'origin/master' into 2.3
---

e1d64050ad6f54e45d3954ffac21daaee58c6240