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		2021-08-22 13:28:57 +02:00
..
locale	updated translation files	2021-08-17 08:45:11 +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	review feedback incorporated	2021-08-16 09:31:02 -05: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-07-29 16:38:26 -05:00