]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f17c3ee 9bc0a60)
Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Sat, 25 May 2013 05:36:42 +0000 (09:36 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Sat, 25 May 2013 05:36:42 +0000 (09:36 +0400)
Conflicts:
locale/sv_SE/LC_MESSAGES/messages.mo
locale/sv_SE/LC_MESSAGES/messages.po


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