From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 2 Dec 2017 20:13:49 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental
X-Git-Tag: 17.12~35
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4ee398a41e2176d4a5c997920db35cb6bed12f2e;p=tt-rss.git

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

4ee398a41e2176d4a5c997920db35cb6bed12f2e