From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 6 Oct 2017 06:45:28 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:git/tt-rss
X-Git-Tag: 17.12~123
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=916c1e9b16d39a7d5a9c5f5167333dd330cc6a7e;p=tt-rss.git

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

916c1e9b16d39a7d5a9c5f5167333dd330cc6a7e