From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 12 Feb 2018 06:38:17 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 18.8~64
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bcdbfa7c675832704095fd65157bcc421becbf95;p=tt-rss.git

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

bcdbfa7c675832704095fd65157bcc421becbf95