From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 28 Mar 2017 12:07:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~127
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=7d1d961267c129e2110ce9cc14c5a9d0a7d255cb

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

7d1d961267c129e2110ce9cc14c5a9d0a7d255cb