Merge branch 'develop'

1 files changed, 23 insertions, 0 deletions

diff --git a/archaeological_finds/migrations/0009_auto_20171010_1644.py b/archaeological_finds/migrations/0009_auto_20171010_1644.py
new file mode 100644
index 000000000..882e9ae86
--- /dev/null
+++ b/archaeological_finds/migrations/0009_auto_20171010_1644.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-10 16:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0008_auto_20171004_1327'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='PreservationType',
+        ),
+        migrations.AlterField(
+            model_name='find',
+            name='preservation_to_considers',
+            field=models.ManyToManyField(blank=True, related_name='finds_recommended', to='archaeological_finds.TreatmentType', verbose_name='Recommended treatments'),
+        ),
+    ]