From: fox <fox+git@fakecake.org>
Date: Mon, 17 Jul 2017 04:31:14 +0000 (+0000)
Subject: Merge branch 'master' of KKozlowski/tt-rss into master
X-Git-Tag: 17.12~142
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2cdef2488821c27acb6f67cad82999fe4fdb8a88;p=tt-rss.git

Merge branch 'master' of KKozlowski/tt-rss into master
---

2cdef2488821c27acb6f67cad82999fe4fdb8a88