From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 17 Aug 2018 07:11:53 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 18.12~95
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=04ad631a08e33c30ba506ed07e93f1815434018d;p=tt-rss.git

Merge branch 'master' of git.fakecake.org:tt-rss
---

04ad631a08e33c30ba506ed07e93f1815434018d