From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 1 Dec 2017 07:17:18 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental
X-Git-Tag: 17.12~103
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d9e60c0f68931c2e6ff8cdf3a941be2504bca16f;p=tt-rss.git

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

d9e60c0f68931c2e6ff8cdf3a941be2504bca16f