From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 31 Mar 2017 08:22:07 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 17.4~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=78fee22415bb1656700551a1cc8895cb714b5334;p=tt-rss.git

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

78fee22415bb1656700551a1cc8895cb714b5334