Merge branch 'develop' into feature/vue3

# Conflicts:
#	.gitignore
#	recipes/settings.py
This commit is contained in:
vabene1111
2024-12-30 14:48:10 +01:00
6 changed files with 35 additions and 24 deletions

2
.gitignore vendored
View File

@@ -86,6 +86,6 @@ vue3/.vite
# Configs
vetur.config.js
venv/
vue3/node_modules
.idea/easy-i18n.xml
cookbook/static/vue3
vue3/node_modules