Merge branch 'develop' into feature/unit-conversion

# Conflicts:
#	vue/yarn.lock

cookbook/migrations/0187_alter_space_use_plural.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-01-20 09:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0186_automation_order_alter_automation_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/migrations/0188_space_no_sharing_limit.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-02-12 16:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0187_alter_space_use_plural'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='no_sharing_limit',
+            field=models.BooleanField(default=False),
+        ),
+    ]