From: fox <fox+git@fakecake.org>
Date: Fri, 22 Dec 2017 15:00:32 +0000 (+0000)
Subject: Merge branch 'otp' of fturco/tt-rss into master
X-Git-Tag: 18.8~94
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=bb0a8e323e961f44ebe52eeb002256f2f797235f

Merge branch 'otp' of fturco/tt-rss into master
---

bb0a8e323e961f44ebe52eeb002256f2f797235f