mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-05 22:28:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/keywords-rework

Browse Source 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2021-06-30 14:57:33 +02:00
parent b4e3f3b49b a508fa81c0
commit 28b67a2ba5
115 changed files with 14137 additions and 5122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vue/src/locales/en.json
View File

@@ -50,9 +50,11 @@
"Date": "Date",
"Share": "Share",
"Export": "Export",
"Copy": "Copy",
"Rating": "Rating",
"Close": "Close",
"Cancel": "Cancel",
"Link": "Link",
"Add": "Add",
"New": "New",
"Success": "Success",
@@ -95,4 +97,4 @@
"Advanced Search Settings": "Advanced Search Settings",
"Download": "Download",
"Root": "Root"
}
}