Merge branch 'develop' into feature/vue3

# Conflicts:
#	recipes/settings.py
This commit is contained in:
vabene1111
2024-02-28 17:25:14 +01:00
3 changed files with 20 additions and 46 deletions

View File

@@ -1,18 +0,0 @@
# Generated by Django 4.2.10 on 2024-02-19 20:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
(
"cookbook",
"0213_remove_property_property_unique_import_food_per_space_and_more",
),
]
operations = [
migrations.DeleteModel(
name="ShoppingList",
),
]

View File

@@ -0,0 +1,16 @@
# Generated by Django 4.2.10 on 2024-02-28 16:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0215_connectorconfig'),
]
operations = [
migrations.DeleteModel(
name='ShoppingList',
),
]