From: Jeremy Benoist 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=-c;p=github%2Fwallabag%2Fwallabag.git Merge remote-tracking branch 'origin/master' into 2.4 --- 44043ebe82a22470e2514d05efac324035ee809a