diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
| commit | 1404416412a50d00719d4f3d6f84dbda75e811b7 (patch) | |
| tree | 5bf13b5605e40c755e20edf9be45e3a20308d5dd /locale/en/LC_MESSAGES/django.mo | |
| parent | 90caf82b1f8be4ab5c54773425026ac92580ff61 (diff) | |
| parent | 13611098c91cb62090b5fc608082ef4c08a50176 (diff) | |
| download | askbot-1404416412a50d00719d4f3d6f84dbda75e811b7.tar.gz askbot-1404416412a50d00719d4f3d6f84dbda75e811b7.tar.bz2 askbot-1404416412a50d00719d4f3d6f84dbda75e811b7.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/en/LC_MESSAGES/django.mo')
| -rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 14218 -> 14334 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex d7523d09..447afac4 100644 --- a/locale/en/LC_MESSAGES/django.mo +++ b/locale/en/LC_MESSAGES/django.mo |