Merge branch 'develop' into develop-bootstrap

1 files changed, 26 insertions, 0 deletions

diff --git a/archaeological_finds/migrations/0014_auto_20171110_1717.py b/archaeological_finds/migrations/0014_auto_20171110_1717.py
new file mode 100644
index 000000000..63458bd9b
--- /dev/null
+++ b/archaeological_finds/migrations/0014_auto_20171110_1717.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-11-10 17:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0021_auto_20171110_1717'),
+        ('archaeological_finds', '0013_auto_20171026_1828'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='find',
+            name='images',
+            field=models.ManyToManyField(blank=True, to='ishtar_common.IshtarImage', verbose_name='Images'),
+        ),
+        migrations.AddField(
+            model_name='treatment',
+            name='images',
+            field=models.ManyToManyField(blank=True, to='ishtar_common.IshtarImage', verbose_name='Images'),
+        ),
+    ]