Merge migrations

10 files changed, 12 insertions, 12 deletions

diff --git a/archaeological_context_records/migrations/0039_auto_20190122_1550.py b/archaeological_context_records/migrations/0041_auto_20190122_1550.py
index 05d12abc4..5931083eb 100644
--- a/archaeological_context_records/migrations/0039_auto_20190122_1550.py
+++ b/archaeological_context_records/migrations/0041_auto_20190122_1550.py
@@ -9,8 +9,8 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'),
-        ('archaeological_context_records', '0038_migrate_main_image'),
+        ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'),
+        ('archaeological_context_records', '0040_auto_20190206_1522'),
     ]
 
     operations = [
diff --git a/archaeological_context_records/migrations/0040_auto_20190206_1423.py b/archaeological_context_records/migrations/0042_auto_20190206_1423.py
index b3c5a6837..a3bfc70d4 100644
--- a/archaeological_context_records/migrations/0040_auto_20190206_1423.py
+++ b/archaeological_context_records/migrations/0042_auto_20190206_1423.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_context_records', '0039_auto_20190122_1550'),
+        ('archaeological_context_records', '0041_auto_20190122_1550'),
     ]
 
     operations = [
diff --git a/archaeological_finds/migrations/0059_auto_20190204_1134.py b/archaeological_finds/migrations/0061_auto_20190204_1134.py
index b2a96097a..bc719b24c 100644
--- a/archaeological_finds/migrations/0059_auto_20190204_1134.py
+++ b/archaeological_finds/migrations/0061_auto_20190204_1134.py
@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_finds', '0058_views_find_nonmodif_treatments'),
+        ('archaeological_finds', '0060_auto_20190206_1522'),
     ]
 
     operations = [
diff --git a/archaeological_finds/migrations/0060_auto_20190206_1423.py b/archaeological_finds/migrations/0062_auto_20190206_1423.py
index 6ddfa5145..8f4a26cec 100644
--- a/archaeological_finds/migrations/0060_auto_20190206_1423.py
+++ b/archaeological_finds/migrations/0062_auto_20190206_1423.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_finds', '0059_auto_20190204_1134'),
+        ('archaeological_finds', '0061_auto_20190204_1134'),
     ]
 
     operations = [
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 = [
diff --git a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py
index 182187e8b..8180ffa15 100644
--- a/ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py
+++ b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0083_document_index_external_id'),
+        ('ishtar_common', '0084_auto_20190206_1522'),
     ]
 
     operations = [
diff --git a/ishtar_common/migrations/0085_auto_20190204_1149.py b/ishtar_common/migrations/0086_auto_20190204_1149.py
index d89a8ac94..0796aa34a 100644
--- a/ishtar_common/migrations/0085_auto_20190204_1149.py
+++ b/ishtar_common/migrations/0086_auto_20190204_1149.py
@@ -9,7 +9,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0084_ishtarsiteprofile_use_town_for_geo'),
+        ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'),
     ]
 
     operations = [