]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3b9fd1 f78e2a1)
Merge branch 'master' of git://github.com/falu/Tiny-Tiny-RSS into falu-master
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 15 May 2013 05:22:29 +0000 (09:22 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 15 May 2013 05:22:29 +0000 (09:22 +0400)
Conflicts:
locale/hu_HU/LC_MESSAGES/messages.po


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