Merge remote-tracking branch 'origin/develop' into develop

maxplanck-ie · Sep 18, 2018 · 810bf9e · 810bf9e
2 parents ac136f2 + 6f0f5b5
commit 810bf9e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/library_sample_shared/migrations/0002_libraryprotocol_status.py b/library_sample_shared/migrations/0002_libraryprotocol_status.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-07 10:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library_sample_shared', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='libraryprotocol',
+            name='status',
+            field=models.PositiveIntegerField(default=1, verbose_name='Status'),
+        ),
+    ]
diff --git a/sample/migrations/0002_nucleicacidtype_status.py b/sample/migrations/0002_nucleicacidtype_status.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-07 08:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sample', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='nucleicacidtype',
+            name='status',
+            field=models.PositiveIntegerField(default=1, verbose_name='Status'),
+        ),
+    ]