From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 22 Aug 2016 21:03:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.1
X-Git-Tag: 2.1.0~59
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=79efca1e6ff28362d4bd2713f68205294cdd07de;hp=79efca1e6ff28362d4bd2713f68205294cdd07de;p=github%2Fwallabag%2Fwallabag.git

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