From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 26 Apr 2017 21:24:29 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 17.12~222
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7f4a24f8681f35d25077524692ba2236583cb732;p=tt-rss.git

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

7f4a24f8681f35d25077524692ba2236583cb732