]> git.wh0rd.org Git - tt-rss.git/commitdiff
Merge branch 'master' of git.fakecake.org:tt-rss
authorAndrew Dolgov <fox@kmvz.us>
Fri, 21 Aug 2015 16:32:07 +0000 (19:32 +0300)
committerAndrew Dolgov <fox@kmvz.us>
Fri, 21 Aug 2015 16:32:07 +0000 (19:32 +0300)

Trivial merge