diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:29:53 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:32:55 -0600 |
| commit | 24507b839fad289892f6037ede3f116514b0008d (patch) | |
| tree | 4902ba9e6151a41580fa10541af899b4fe7606ea /locale/zh_CN | |
| parent | 9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3 (diff) | |
| parent | 1404416412a50d00719d4f3d6f84dbda75e811b7 (diff) | |
| download | askbot-24507b839fad289892f6037ede3f116514b0008d.tar.gz askbot-24507b839fad289892f6037ede3f116514b0008d.tar.bz2 askbot-24507b839fad289892f6037ede3f116514b0008d.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/footer.html
templates/header.html
templates/index.html
urls.py
Diffstat (limited to 'locale/zh_CN')
0 files changed, 0 insertions, 0 deletions