]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
authorAndrew Dolgov <noreply@fakecake.org>
Sun, 22 Jan 2017 07:19:11 +0000 (10:19 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Sun, 22 Jan 2017 07:19:11 +0000 (10:19 +0300)

Trivial merge