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

..

features

updated openeats importer

2021-06-11 15:28:11 +02:00

install

Fix nginx_proxy docker-compose example

2021-05-13 11:15:31 +02:00

stylesheets

new style and icon

2021-02-13 18:04:33 +01:00

system

added more documentation

2021-01-06 00:17:53 +01:00

CNAME

fixed path

2021-02-13 18:19:38 +01:00

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

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

logo_color.svg

new style and icon

2021-02-13 18:04:33 +01:00

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