From: fox <fox+git@fakecake.org>
Date: Thu, 30 Nov 2017 13:27:10 +0000 (+0000)
Subject: Merge branch 'master' of cac2s/tt-rss into master
X-Git-Tag: 17.12~35^2~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9e0bb535d65f28bbe08c27dd3f1d77b48f06d459;p=tt-rss.git

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

9e0bb535d65f28bbe08c27dd3f1d77b48f06d459