From: fox <fox+git@fakecake.org>
Date: Mon, 11 Dec 2017 09:47:04 +0000 (+0000)
Subject: Merge branch 'master' of dim0x69/tt-rss into master
X-Git-Tag: 18.8~119^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c463a95dca0a5f2fbcdc1b67fd97f8c1159523f5;p=tt-rss.git

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

c463a95dca0a5f2fbcdc1b67fd97f8c1159523f5