diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-15 09:22:29 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-15 09:22:29 +0400 |
| commit | 52af297e745f5b5c101c642c45e08d268aa324d8 (patch) | |
| tree | 6796bb95d277b9ee9fd3a549e2ceafdff66df56c /locale/zh_CN/LC_MESSAGES/messages.mo | |
| parent | a3b9fd12c55a0222060348c3042b17de6f269e0a (diff) | |
| parent | f78e2a1f34bf3929f2f4866d08c53f55c0a5823f (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 'locale/zh_CN/LC_MESSAGES/messages.mo')
| -rw-r--r-- | locale/zh_CN/LC_MESSAGES/messages.mo | bin | 32616 -> 42009 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo Binary files differindex 5b3b7ca3a..105efffae 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.mo +++ b/locale/zh_CN/LC_MESSAGES/messages.mo |