From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 18 Nov 2016 09:24:55 +0000 (+0100)
Subject: Merge pull request #2596 from wallabag/prepare-214
X-Git-Tag: 2.1.4~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8853914ba4fdc42d9676598e3db79a4d07e3b697;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2596 from wallabag/prepare-214

Prepare wallabag 2.1.4 :rocket:
---

8853914ba4fdc42d9676598e3db79a4d07e3b697