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
..
edit_import_recipe.html	cleaned up form buttons	2020-01-01 21:00:44 +01:00
edit_internal_recipe.html	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
ingredients.html	fixed some english translations	2020-12-26 13:46:55 +01:00