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 /archaeological_operations/migrations/0001_initial.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 'archaeological_operations/migrations/0001_initial.py')
| -rw-r--r-- | archaeological_operations/migrations/0001_initial.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_operations/migrations/0001_initial.py b/archaeological_operations/migrations/0001_initial.py index 6e4b66ce6..4172b9beb 100644 --- a/archaeological_operations/migrations/0001_initial.py +++ b/archaeological_operations/migrations/0001_initial.py @@ -6,6 +6,7 @@ from django.db import models class Migration(SchemaMigration): + depends_on = (('archaeological_files', '0001_initial.py'), ) def forwards(self, orm): # Adding model 'RemainType' @@ -1056,4 +1057,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['archaeological_operations']
\ No newline at end of file + complete_apps = ['archaeological_operations'] |