From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 13 Dec 2017 05:21:50 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
X-Git-Tag: 18.8~109
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f830f853a919c458d06bdc6ce292b8ae73a801f3;p=tt-rss.git

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

f830f853a919c458d06bdc6ce292b8ae73a801f3