diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 11:03:14 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 11:03:14 -0600 |
commit | 9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3 (patch) | |
tree | 8622dc0313e6cdb9e2903b96f5fa5a6b27912902 /locale/en/LC_MESSAGES/django.po | |
parent | 9e70d5be2571f7671c06c6960c04fff414b4d87c (diff) | |
parent | dc48a3197434baac279fa438c7a399b210723715 (diff) | |
download | askbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.tar.gz askbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.tar.bz2 askbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.zip |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'locale/en/LC_MESSAGES/django.po')
0 files changed, 0 insertions, 0 deletions