diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /ishtar_common/migrations/0015_remove_ishtar_local_prefix.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'ishtar_common/migrations/0015_remove_ishtar_local_prefix.py')
| -rw-r--r-- | ishtar_common/migrations/0015_remove_ishtar_local_prefix.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ishtar_common/migrations/0015_remove_ishtar_local_prefix.py b/ishtar_common/migrations/0015_remove_ishtar_local_prefix.py index 67624b039..38532daee 100644 --- a/ishtar_common/migrations/0015_remove_ishtar_local_prefix.py +++ b/ishtar_common/migrations/0015_remove_ishtar_local_prefix.py @@ -6,6 +6,7 @@ from django.db import models class Migration(SchemaMigration): + no_dry_run = True def forwards(self, orm): if not db.dry_run: |