]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c33d3e 3eb5533)
Merge remote-tracking branch 'upstream/master'
authorPerry Werneck <perry.werneck@gmail.com>
Sun, 11 Aug 2013 13:41:50 +0000 (10:41 -0300)
committerPerry Werneck <perry.werneck@gmail.com>
Sun, 11 Aug 2013 13:41:50 +0000 (10:41 -0300)

Trivial merge
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/