From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 10 Jun 2017 12:41:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~58
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=inline;h=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;p=github%2Fwallabag%2Fwallabag.git

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

873f6b8e03079d11fab541aa5b0bc6f8fe2d645e