From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 3 Jul 2018 11:55:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=44043ebe82a22470e2514d05efac324035ee809a;hp=e586d65b64089fc1cc230a18c470aae3f45f91a6;p=github%2Fwallabag%2Fwallabag.git

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