From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 26 Apr 2017 11:07:55 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 17.12~236
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0a32d3f029cc4d701327fb48d61af664a93dfdcf;p=tt-rss.git

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

0a32d3f029cc4d701327fb48d61af664a93dfdcf