From: fox <fox+git@fakecake.org>
Date: Tue, 14 Nov 2017 05:22:12 +0000 (+0000)
Subject: Merge branch 'master' of tschuettler/tt-rss into master
X-Git-Tag: 17.12~112^2~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=138813314e4b406034630cc295fd50d704da3c41;p=tt-rss.git

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

138813314e4b406034630cc295fd50d704da3c41