summaryrefslogtreecommitdiff
path: root/messages.pot
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-15 09:22:29 +0400
committerAndrew Dolgov <[email protected]>2013-05-15 09:22:29 +0400
commit52af297e745f5b5c101c642c45e08d268aa324d8 (patch)
tree6796bb95d277b9ee9fd3a549e2ceafdff66df56c /messages.pot
parenta3b9fd12c55a0222060348c3042b17de6f269e0a (diff)
parentf78e2a1f34bf3929f2f4866d08c53f55c0a5823f (diff)
Merge branch 'master' of git://github.com/falu/Tiny-Tiny-RSS into falu-master
Conflicts: locale/hu_HU/LC_MESSAGES/messages.po
Diffstat (limited to 'messages.pot')
0 files changed, 0 insertions, 0 deletions