]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 313e4f9 75118f1)
Merge branch 'master' of github.com:skikuta/Tiny-Tiny-RSS
authorskikuta <kik0220@gmail.com>
Wed, 20 Mar 2013 23:39:52 +0000 (08:39 +0900)
committerskikuta <kik0220@gmail.com>
Wed, 20 Mar 2013 23:39:52 +0000 (08:39 +0900)
Conflicts:
locale/ja_JP/LC_MESSAGES/messages.po


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