From: fox <fox+git@fakecake.org>
Date: Wed, 17 Jan 2018 17:45:28 +0000 (+0000)
Subject: Merge branch 'master' of cvidal/tt-rss into master
X-Git-Tag: 18.8~86
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a421eb655da52a627ee91ae6eddcbbb3d9bc6f2d;p=tt-rss.git

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

a421eb655da52a627ee91ae6eddcbbb3d9bc6f2d