From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Thu, 13 Apr 2017 11:07:06 +0000 (+0200)
Subject: Merge branch 'master' into 2.3
X-Git-Tag: 2.3.0~31^2~121
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3e7a843aa998442148061347e7978722b8cd87d2;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'master' into 2.3
---

3e7a843aa998442148061347e7978722b8cd87d2