]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e93756 1d76589)
Merge branch 'master' into jremote
authorjustauser <justausr@hotmail.com>
Tue, 28 May 2013 15:39:58 +0000 (11:39 -0400)
committerjustauser <justausr@hotmail.com>
Tue, 28 May 2013 15:39:58 +0000 (11:39 -0400)
update working to master


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