Merge branch 'master' into develop

1 files changed, 19 insertions, 0 deletions

diff --git a/archaeological_warehouse/migrations/0012_auto_20180109_1057.py b/archaeological_warehouse/migrations/0012_auto_20180109_1057.py
new file mode 100644
index 000000000..c857bb3d2
--- /dev/null
+++ b/archaeological_warehouse/migrations/0012_auto_20180109_1057.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-09 10:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0011_auto_20171026_1828'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='container',
+            unique_together=set([('index', 'responsible')]),
+        ),
+    ]