summaryrefslogtreecommitdiff
path: root/ishtar_common/migrations
diff options
context:
space:
mode:
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
commit2287f9bbf0b8836aadc1f32a9a90203f1886d26d (patch)
tree8b2abb0a3ddad6302d2be544b16ea971ded6bb8d /ishtar_common/migrations
parent172eb15954d2403831b073c785c38cac84505927 (diff)
downloadIshtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.tar.bz2
Ishtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.zip
Merge migrations
Diffstat (limited to 'ishtar_common/migrations')
-rw-r--r--ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py (renamed from ishtar_common/migrations/0084_ishtarsiteprofile_use_town_for_geo.py)2
-rw-r--r--ishtar_common/migrations/0086_auto_20190204_1149.py (renamed from ishtar_common/migrations/0085_auto_20190204_1149.py)2
2 files changed, 2 insertions, 2 deletions
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 = [