vabene1111 063a0dec24 Merge branch 'master' into develop ...

# Conflicts:
#	requirements.txt

2022-01-06 16:08:06 +01:00

..

__init__.py

telegram bot

2021-03-18 22:34:53 +01:00

api.py

Merge branch 'master' into develop

2022-01-06 16:08:06 +01:00

data.py

Fix after rebase

2021-12-28 12:03:31 -06:00

delete.py

improved deletion of recipes

2021-11-04 12:27:21 +01:00

edit.py

disable external recipes in hosted version

2021-11-04 15:56:22 +01:00

import_export.py

added copy me that importer

2021-12-23 15:54:48 +01:00

lists.py

fix responsive display of shopping list

2021-12-28 12:03:35 -06:00

new.py

Fix after rebase

2021-12-30 13:55:38 -06:00

telegram.py

converted ingredient parser to class and added automation beta hint

2021-09-16 17:52:11 +02:00

views.py

change ingore_inherit to inherit_fields

2021-12-30 12:54:39 -06:00