vabene1111
31cb9e283a
Merge branch 'develop' into feature/fulltext-search
# 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
# requirements.txt
# vue/src/apps/RecipeSearchView/RecipeSearchView.vue
# vue/src/components/GenericMultiselect.vue
# vue/src/locales/en.json