]> git.wh0rd.org Git - tt-rss.git/commit
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)
commit52af297e745f5b5c101c642c45e08d268aa324d8
tree6796bb95d277b9ee9fd3a549e2ceafdff66df56c
parenta3b9fd12c55a0222060348c3042b17de6f269e0a
parentf78e2a1f34bf3929f2f4866d08c53f55c0a5823f
Merge branch 'master' of git://github.com/falu/Tiny-Tiny-RSS into falu-master

Conflicts:
locale/hu_HU/LC_MESSAGES/messages.po