]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7a5c8a 0dfdf70)
fix merge conflict with master
authorAndrew Dolgov <fox@bah.org.ru>
Mon, 13 Sep 2010 10:50:23 +0000 (14:50 +0400)
committerAndrew Dolgov <fox@bah.org.ru>
Mon, 13 Sep 2010 10:50:23 +0000 (14:50 +0400)

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