diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-27 12:48:13 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-27 12:48:13 +0400 |
| commit | 6d473e9cd5119848b6267d671226bdba9ee69fe3 (patch) | |
| tree | be34abe740f363ce880526cc707b3ec54949af39 /messages.pot | |
| parent | c855628d2d17e3e203f4688fde2f334630f947ce (diff) | |
| parent | 84eee5df1b9168173bb20f461f90b916e8a3ee53 (diff) | |
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
Diffstat (limited to 'messages.pot')
0 files changed, 0 insertions, 0 deletions