]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams...
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 2 Apr 2013 12:55:13 +0000 (16:55 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Tue, 2 Apr 2013 12:55:13 +0000 (16:55 +0400)
commit2bf5783f81c3825be2c1d3ad26b6d8d7560cdfcb
treec9e03f9eb1bd72fa9a45452751f0c9b6ba57edec
parented61425af0e948553f1370d064f0086885b81906
parent127585a05cba0f9d5d79ed5cf83394f04a7138d4
Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams-master

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