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 /archaeological_context_records | |
| parent | 9f4e59e66686651b30a2e7976ba139627adabe22 (diff) | |
| download | Ishtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.tar.bz2 Ishtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.zip | |
Merge migrations
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/migrations/0041_auto_20190122_1550.py (renamed from archaeological_context_records/migrations/0039_auto_20190122_1550.py) | 4 | ||||
| -rw-r--r-- | archaeological_context_records/migrations/0042_auto_20190206_1423.py (renamed from archaeological_context_records/migrations/0040_auto_20190206_1423.py) | 2 |
2 files changed, 3 insertions, 3 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 = [ |