From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 9 Oct 2018 11:16:38 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 18.12~66
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e60e4ac08627d467c25eba6e1b62069bc5cfc168;p=tt-rss.git

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

e60e4ac08627d467c25eba6e1b62069bc5cfc168