From: fox <fox+git@fakecake.org>
Date: Thu, 14 Dec 2017 18:01:21 +0000 (+0000)
Subject: Merge branch 'master' of simonpl/tt-rss into master
X-Git-Tag: 18.8~100
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f559d74a4e8dcab529813cb70526dc5762f4a4bf;p=tt-rss.git

Merge branch 'master' of simonpl/tt-rss into master
---

f559d74a4e8dcab529813cb70526dc5762f4a4bf