]> git.wh0rd.org - tt-rss.git/commitdiff
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
authorAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Thu, 3 Sep 2015 13:41:35 +0000 (16:41 +0300)
committerAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Thu, 3 Sep 2015 13:41:35 +0000 (16:41 +0300)

Trivial merge