From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 11:27:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.1
X-Git-Tag: 2.1.0~16
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=114c55c0a6eade2ba6c53fe25f61cc58cca91620

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

114c55c0a6eade2ba6c53fe25f61cc58cca91620