From: Jeremy Benoist Date: Mon, 21 Nov 2016 14:15:30 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into 2.2 X-Git-Tag: 2.2.0~3^2~56 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=eb2d613c3ed95d741e987917f976da349ea240eb Merge remote-tracking branch 'origin/master' into 2.2 --- eb2d613c3ed95d741e987917f976da349ea240eb