vabene1111 28b67a2ba5 Merge branch 'develop' into feature/keywords-rework ... # 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		2021-06-30 14:57:33 +02:00
..
chunk-vendors.js	minor ui/ux improvements	2021-06-30 04:12:52 +02:00
import_response_view.js	further improvements to search view	2021-06-28 18:35:20 +02:00
keyword_list_view.js	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
offline_view.js	further improvements to search view	2021-06-28 18:35:20 +02:00
recipe_search_view.js	minor ui/ux improvements	2021-06-30 04:12:52 +02:00
recipe_view.js	minor ui/ux improvements	2021-06-30 04:12:52 +02:00
supermarket_view.js	further improvements to search view	2021-06-28 18:35:20 +02:00
user_file_view.js	further improvements to search view	2021-06-28 18:35:20 +02:00