Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

# Conflicts:
#	vue/src/apps/ShoppingListView/ShoppingListView.vue
This commit is contained in:
Kaibu
2022-04-23 20:45:35 +02:00
12 changed files with 147 additions and 88 deletions

View File

@@ -368,6 +368,7 @@
"no_pinned_recipes": "You have no pinned recipes!",
"Planned": "Planned",
"Pinned": "Pinned",
"Imported": "Imported",
"Quick actions": "Quick actions",
"Ratings": "Ratings",
"Internal": "Internal",