diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:03 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:03 -0600 |
| commit | 0cf45ee118daddc397b32d43d2c533c6c3767384 (patch) | |
| tree | 5bf13b5605e40c755e20edf9be45e3a20308d5dd /locale/zh_CN | |
| parent | 45abe6752f300830d8b61b94a2b6aea7bcdab9df (diff) | |
| parent | b2735a9f19228353dd603b287145974f65de90fe (diff) | |
| download | askbot-0cf45ee118daddc397b32d43d2c533c6c3767384.tar.gz askbot-0cf45ee118daddc397b32d43d2c533c6c3767384.tar.bz2 askbot-0cf45ee118daddc397b32d43d2c533c6c3767384.zip | |
Merge branch 'evgenyfadeev/master'
Conflicts:
locale/en/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'locale/zh_CN')
0 files changed, 0 insertions, 0 deletions