]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d707e9 2229e6e)
Merge remote-tracking branch 'upstream/master'
authorRichard Beales <rich@richbeales.net>
Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
committerRichard Beales <rich@richbeales.net>
Tue, 19 Mar 2013 18:19:07 +0000 (18:19 +0000)
1  2 
js/tt-rss.js patch | diff1 | diff2 | blob | history

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