summaryrefslogtreecommitdiff
path: root/archaeological_context_records
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-05-07 17:47:09 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-12 08:44:18 +0200
commit77454b534e28adefa348c579376221d8c8977eb0 (patch)
treedcea982e11a602b3217f7ad14f13daf1fa3d77fc /archaeological_context_records
parentcdadd4ad64b6eedc5a6c77bdfba484501c6210e4 (diff)
downloadIshtar-77454b534e28adefa348c579376221d8c8977eb0.tar.bz2
Ishtar-77454b534e28adefa348c579376221d8c8977eb0.zip
Merge migrations
Diffstat (limited to 'archaeological_context_records')
-rw-r--r--archaeological_context_records/migrations/0021_auto_20180423_1838.py (renamed from archaeological_context_records/migrations/0020_auto_20180423_1838.py)2
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_context_records/migrations/0020_auto_20180423_1838.py b/archaeological_context_records/migrations/0021_auto_20180423_1838.py
index 11995b0c6..c26e46c07 100644
--- a/archaeological_context_records/migrations/0020_auto_20180423_1838.py
+++ b/archaeological_context_records/migrations/0021_auto_20180423_1838.py
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
dependencies = [
('ishtar_common', '0048_auto_20180423_1838'),
- ('archaeological_context_records', '0019_auto_20180403_1120'),
+ ('archaeological_context_records', '0020_auto_20180430_1318'),
]
operations = [