From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 24 Oct 2016 10:03:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.2
X-Git-Tag: 2.2.0~3^2~83
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=64a8781e453c40ff144d03405abe2dc1ccfacbe0;hp=64a8781e453c40ff144d03405abe2dc1ccfacbe0;p=github%2Fwallabag%2Fwallabag.git

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