From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 30 Nov 2018 21:12:15 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f661a37efa1be426e1e1d34630dd6da675be7cc8;p=tt-rss.git

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

f661a37efa1be426e1e1d34630dd6da675be7cc8