From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 2 Oct 2016 15:37:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.1
X-Git-Tag: 2.1.0~6
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=77557d289bafc088baf806e4744f110dfd959300

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

77557d289bafc088baf806e4744f110dfd959300