summaryrefslogtreecommitdiff
path: root/archaeological_finds/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 /archaeological_finds/migrations
parent172eb15954d2403831b073c785c38cac84505927 (diff)
downloadIshtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.tar.bz2
Ishtar-2287f9bbf0b8836aadc1f32a9a90203f1886d26d.zip
Merge migrations
Diffstat (limited to 'archaeological_finds/migrations')
-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 = [