diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-09 18:44:32 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-09 18:44:32 -0600 |
| commit | 0a9a8414adaab29ff616c94286f84f845b35a36d (patch) | |
| tree | 157532876a5c3be187f4b494655c4167fac5432a /locale/es/LC_MESSAGES/django.mo | |
| parent | 25fe4c589c822e28c48c9afb1f2cbc80f6f7cce6 (diff) | |
| parent | 5d900baf26548c0efec7f3f93c5f67252ed46666 (diff) | |
| download | askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.tar.gz askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.tar.bz2 askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'locale/es/LC_MESSAGES/django.mo')
| -rw-r--r-- | locale/es/LC_MESSAGES/django.mo | bin | 42056 -> 42047 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex dec5aa7f..7e69adc9 100644 --- a/locale/es/LC_MESSAGES/django.mo +++ b/locale/es/LC_MESSAGES/django.mo |