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
..
api	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
edits	fixed recipe tests paths and edit max switch	2021-05-30 09:27:20 +02:00
other	fixed unit test	2021-06-21 13:51:47 +02:00
resources	all tests migrated and improved	2021-03-17 22:10:58 +01:00
views	all tests migrated and improved	2021-03-17 22:10:58 +01:00
__init__.py
conftest.py	migrated space to ingredient, step and nutritional value	2021-06-15 22:56:25 +02:00