]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4eaba65 4533b3e)
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
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/