From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 20 May 2018 07:41:15 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 18.8~36
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=f851cdf3628ba90dac4f1891eae3b1aea9261eb5

Merge branch 'master' of git.tt-rss.org:fox/tt-rss
---

f851cdf3628ba90dac4f1891eae3b1aea9261eb5