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
..
src	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
.gitignore	testing vue stuff	2021-01-08 00:14:31 +01:00
babel.config.js	testing vue stuff	2021-01-08 00:14:31 +01:00
babel.config.js.c	made and compiled messages	2021-04-11 15:09:54 +02:00
package-lock.json	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
package.json	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
tsconfig.json	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
vue.config.js	Squashed commit of the following:	2021-06-09 20:41:40 -05:00
webpack-stats.json	build javascript dependencies	2021-06-21 13:32:26 +02:00
yarn.lock	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00