]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of https://tt-rss.org/git/tt-rss
authordedioste <dedioste@gmail.com>
Mon, 27 Jul 2015 19:58:08 +0000 (21:58 +0200)
committerdedioste <dedioste@gmail.com>
Mon, 27 Jul 2015 19:58:08 +0000 (21:58 +0200)

Trivial merge