]> git.wh0rd.org Git - tt-rss.git/commit
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)
commit82076ce53113be9cc053f8740356e7e1b81e5643
tree5eba36805f593ec7dd0aad671b5bcca0ae01cf53
parent66af65f14b4f3c670bb3f9ca7b1c80081f9281d1
parent23923fb29b345c1eea5b70a6df4d30395425bf37
Merge branch 'master' into css-feedtree-counter

Conflicts:
tt-rss.css
js/FeedTree.js