From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 6 Jun 2017 18:15:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~70
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=c07ec4b6820723165bd7b832681ad6d43ad605d0

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

c07ec4b6820723165bd7b832681ad6d43ad605d0