diff options
author | Evan Prodromou <evan@status.net> | 2009-10-13 17:25:54 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-10-13 17:25:54 -0400 |
commit | 67c387c6a0dc80a5c9beac9d73717763a2ba96f4 (patch) | |
tree | 5f03f3939c3ca71f4b9088abf6c3fcdb0f4a6c3f /locale/zh_CN/LC_MESSAGES/statusnet.mo | |
parent | 181de862efe2da16164daea32b74c3da8ea2ed7e (diff) | |
parent | bf4626ddf6362b81d1ce23a5cc300b4d5694c146 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
install.php
Diffstat (limited to 'locale/zh_CN/LC_MESSAGES/statusnet.mo')
-rw-r--r-- | locale/zh_CN/LC_MESSAGES/statusnet.mo | bin | 63488 -> 76504 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo Binary files differindex a7a79f40c..7984ab714 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.mo +++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo |