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
..
features	updated openeats importer	2021-06-11 15:28:11 +02:00
install	Send proper protocol to Django from Nginx	2021-08-20 02:16:32 -05:00
stylesheets
system
CNAME
contribute.md	translations doc	2021-04-15 18:43:02 +02:00
faq.md	added a small faq to the docs	2021-04-15 21:15:26 +02:00
index.md	Squashed commit of the following:	2021-07-29 16:38:26 -05:00
logo_color.svg
preview.png	mockup updated	2021-06-09 19:04:14 +02:00
preview.xcf	updated preview image	2021-02-15 22:05:04 +01:00