]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'master' of git://github.com/RaphaelRochet/Tiny-Tiny-RSS into RaphaelRoc...
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 27 Mar 2013 08:48:13 +0000 (12:48 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 27 Mar 2013 08:48:13 +0000 (12:48 +0400)
commit6d473e9cd5119848b6267d671226bdba9ee69fe3
treebe34abe740f363ce880526cc707b3ec54949af39
parentc855628d2d17e3e203f4688fde2f334630f947ce
parent84eee5df1b9168173bb20f461f90b916e8a3ee53
Merge branch 'master' of git://github.com/RaphaelRochet/Tiny-Tiny-RSS into RaphaelRochet-master

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