diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2019-02-06 16:17:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-24 19:38:56 +0200 |
| commit | 2287f9bbf0b8836aadc1f32a9a90203f1886d26d (patch) | |
| tree | 8b2abb0a3ddad6302d2be544b16ea971ded6bb8d /archaeological_operations | |
| parent | 172eb15954d2403831b073c785c38cac84505927 (diff) | |
| download | Ishtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.tar.bz2 Ishtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.zip | |
Merge migrations
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/migrations/0049_auto_20190122_1550.py (renamed from archaeological_operations/migrations/0047_auto_20190122_1550.py) | 4 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0050_point_to_point_2d.py (renamed from archaeological_operations/migrations/0048_point_to_point_2d.py) | 2 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0051_auto_20190122_1621.py (renamed from archaeological_operations/migrations/0049_auto_20190122_1621.py) | 2 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0052_auto_20190206_1423.py (renamed from archaeological_operations/migrations/0050_auto_20190206_1423.py) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/archaeological_operations/migrations/0047_auto_20190122_1550.py b/archaeological_operations/migrations/0049_auto_20190122_1550.py index 628a997c6..b85df18f2 100644 --- a/archaeological_operations/migrations/0047_auto_20190122_1550.py +++ b/archaeological_operations/migrations/0049_auto_20190122_1550.py @@ -10,8 +10,8 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'), - ('archaeological_operations', '0046_migrate_main_image'), + ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('archaeological_operations', '0048_auto_20190206_1522'), ] operations = [ diff --git a/archaeological_operations/migrations/0048_point_to_point_2d.py b/archaeological_operations/migrations/0050_point_to_point_2d.py index 9b590ff7b..59fdcccda 100644 --- a/archaeological_operations/migrations/0048_point_to_point_2d.py +++ b/archaeological_operations/migrations/0050_point_to_point_2d.py @@ -19,7 +19,7 @@ def point_to_point_2d(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('archaeological_operations', '0047_auto_20190122_1550'), + ('archaeological_operations', '0049_auto_20190122_1550'), ] operations = [ diff --git a/archaeological_operations/migrations/0049_auto_20190122_1621.py b/archaeological_operations/migrations/0051_auto_20190122_1621.py index 16dbb507f..a51235945 100644 --- a/archaeological_operations/migrations/0049_auto_20190122_1621.py +++ b/archaeological_operations/migrations/0051_auto_20190122_1621.py @@ -9,7 +9,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('archaeological_operations', '0048_point_to_point_2d'), + ('archaeological_operations', '0050_point_to_point_2d'), ] operations = [ diff --git a/archaeological_operations/migrations/0050_auto_20190206_1423.py b/archaeological_operations/migrations/0052_auto_20190206_1423.py index a632b6059..0d61f4fd3 100644 --- a/archaeological_operations/migrations/0050_auto_20190206_1423.py +++ b/archaeological_operations/migrations/0052_auto_20190206_1423.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('archaeological_operations', '0049_auto_20190122_1621'), + ('archaeological_operations', '0051_auto_20190122_1621'), ] operations = [ |