]> git.wh0rd.org Git - tt-rss.git/commit
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)
commit33945d7517d32a1a515e8123152dffed5651020c
treec95950b1c378a4b0cd6711f3fe4e00e853ebbd97
parentf17c3ee29a46e8cca48312c8582dd01b0410bc16
parent9bc0a6006e4937d2d4e20b6cdc25397a65cda00c
Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master

Conflicts:
locale/sv_SE/LC_MESSAGES/messages.mo
locale/sv_SE/LC_MESSAGES/messages.po