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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

303

cookbook/static/vue/js/chunk-vendors.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/import_response_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/offline_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/recipe_search_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/recipe_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/supermarket_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/user_file_view.js

File diff suppressed because one or more lines are too long