diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-06 21:43:51 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-06 21:43:51 -0300 |
| commit | 22a600f7e328fdcc176cf7725dac78ea989d67fa (patch) | |
| tree | 5317b7db57ee06b126558017c1d7e2c03567bd86 /askbot/migrations | |
| parent | 228fe2fa12d25ea73edfcd38d6448d7a30318796 (diff) | |
| parent | be47ef965a8defddad9120ee1e41cee074729eaf (diff) | |
| download | askbot-22a600f7e328fdcc176cf7725dac78ea989d67fa.tar.gz askbot-22a600f7e328fdcc176cf7725dac78ea989d67fa.tar.bz2 askbot-22a600f7e328fdcc176cf7725dac78ea989d67fa.zip | |
Merge branch 'master' into multilang
Diffstat (limited to 'askbot/migrations')
| -rw-r--r-- | askbot/migrations/0161_add_field__user_languages.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/askbot/migrations/0161_add_field__user_languages.py b/askbot/migrations/0161_add_field__user_languages.py index 4e8c351f..534a3733 100644 --- a/askbot/migrations/0161_add_field__user_languages.py +++ b/askbot/migrations/0161_add_field__user_languages.py @@ -9,9 +9,12 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'Thread.language_code' - db.add_column('auth_user', 'languages', - self.gf('django.db.models.fields.CharField')(default='en', max_length=128), - keep_default=False) + try: + db.add_column('auth_user', 'languages', + self.gf('django.db.models.fields.CharField')(default='en', max_length=128), + keep_default=False) + except: + pass def backwards(self, orm): # Deleting field 'Thread.junk' |