From: fox <fox+git@fakecake.org>
Date: Wed, 24 Jan 2018 07:03:59 +0000 (+0000)
Subject: Merge branch 'master' of jsoares/tt-rss into master
X-Git-Tag: 18.8~84
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=fdde11555717ab2c58af555600ea9a38d6c2d681;p=tt-rss.git

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

fdde11555717ab2c58af555600ea9a38d6c2d681