From: fox <fox+git@fakecake.org>
Date: Sun, 11 Feb 2018 07:10:13 +0000 (+0000)
Subject: Merge branch 'master' of JustAMacUser/tt-rss into master
X-Git-Tag: 18.8~69
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=304d898e6b5f67c66b7edbf1f5d3301e91e4459f;hp=-c;p=tt-rss.git

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

304d898e6b5f67c66b7edbf1f5d3301e91e4459f