From: fox <fox+git@fakecake.org>
Date: Wed, 23 May 2018 05:19:59 +0000 (+0000)
Subject: Merge branch 'master' of impa/tt-rss into master
X-Git-Tag: 18.8~34
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f7253dbb4e1ffd8a8e24219db61d05eb3b20c04b;p=tt-rss.git

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

f7253dbb4e1ffd8a8e24219db61d05eb3b20c04b