From: fox <fox+git@fakecake.org>
Date: Sun, 26 Nov 2017 14:44:43 +0000 (+0000)
Subject: Merge branch 'ja_fix' of yoheie/tt-rss into master
X-Git-Tag: 17.12~111
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d7effa92a49b5ed64d0f4cfa87a6aabaf9cfaa93;p=tt-rss.git

Merge branch 'ja_fix' of yoheie/tt-rss into master
---

d7effa92a49b5ed64d0f4cfa87a6aabaf9cfaa93