diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-02 16:55:13 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-02 16:55:13 +0400 |
| commit | 2bf5783f81c3825be2c1d3ad26b6d8d7560cdfcb (patch) | |
| tree | c9e03f9eb1bd72fa9a45452751f0c9b6ba57edec /messages.pot | |
| parent | ed61425af0e948553f1370d064f0086885b81906 (diff) | |
| parent | 127585a05cba0f9d5d79ed5cf83394f04a7138d4 (diff) | |
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
Diffstat (limited to 'messages.pot')
0 files changed, 0 insertions, 0 deletions