From: fox <fox+git@fakecake.org>
Date: Thu, 18 Jan 2018 12:40:24 +0000 (+0000)
Subject: Merge branch 'master' of binfalse/tt-rss into master
X-Git-Tag: 18.8~85
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=36eed4d7374866f314fbdac4d00b37039674239b;p=tt-rss.git

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

36eed4d7374866f314fbdac4d00b37039674239b