]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66af65f 23923fb)
Merge branch 'master' into css-feedtree-counter
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 7 May 2013 11:36:14 +0000 (15:36 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 7 May 2013 11:36:14 +0000 (15:36 +0400)
Conflicts:
tt-rss.css

1  2 
js/FeedTree.js patch | diff1 | diff2 | blob | history

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