diff options
| author | Étienne Loks <etienne@peacefrogs.net> | 2019-02-06 16:17:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-24 19:38:56 +0200 |
| commit | 60fa8eae45f6c1ac8ca263c4c2cdda34d3757973 (patch) | |
| tree | 8b2abb0a3ddad6302d2be544b16ea971ded6bb8d /ishtar_common | |
| parent | 9f4e59e66686651b30a2e7976ba139627adabe22 (diff) | |
| download | Ishtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.tar.bz2 Ishtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.zip | |
Merge migrations
Diffstat (limited to 'ishtar_common')
| -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 = [ |