summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
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
commit60fa8eae45f6c1ac8ca263c4c2cdda34d3757973 (patch)
tree8b2abb0a3ddad6302d2be544b16ea971ded6bb8d /archaeological_finds
parent9f4e59e66686651b30a2e7976ba139627adabe22 (diff)
downloadIshtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.tar.bz2
Ishtar-60fa8eae45f6c1ac8ca263c4c2cdda34d3757973.zip
Merge migrations
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/migrations/0061_auto_20190204_1134.py (renamed from archaeological_finds/migrations/0059_auto_20190204_1134.py)2
-rw-r--r--archaeological_finds/migrations/0062_auto_20190206_1423.py (renamed from archaeological_finds/migrations/0060_auto_20190206_1423.py)2
2 files changed, 2 insertions, 2 deletions
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 = [