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
..
locale	updated base language files	2021-06-12 20:30:41 +02:00
__init__.py	removed celery 2	2020-06-11 23:29:24 +02:00
middleware.py	recipes	2021-01-10 14:36:10 +01:00
settings.py	Merge branch 'develop' into feature/keywords-rework	2021-06-30 14:57:33 +02:00
urls.py	prometheus basics and aws fix	2021-06-05 14:41:32 +02:00
version.py	version script test	2020-06-10 10:07:33 +02:00
wsgi.py	Squashed commit of the following:	2021-06-09 20:41:40 -05:00