vabene1111 4047febec9 Merge branch 'develop' into feature/shopping_list_v2

2022-01-04 07:58:36 +01:00

..

fixtures

…

helper

merge ignore shopping with onhand

2021-12-29 16:32:19 -06:00

integration

Fix after rebase

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

locale

…

management/commands

…

migrations

change ingore_inherit to inherit_fields

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

provider

…

static

Fix after rebase

2021-12-28 12:05:14 -06:00

templates

merge ignore shopping with onhand

2021-12-29 16:32:19 -06:00

templatetags

…

tests

change ingore_inherit to inherit_fields

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

views

Fix after rebase

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

__init__.py

…

admin.py

Fix after rebase

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

apps.py

Merge branch 'develop' into feature/shopping_list_v2

2022-01-04 07:58:36 +01:00

filters.py

…

forms.py

change ingore_inherit to inherit_fields

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

managers.py

…

models.py

change ingore_inherit to inherit_fields

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

schemas.py

Fix after rebase

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

serializer.py

change ingore_inherit to inherit_fields

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

signals.py

change ingore_inherit to inherit_fields

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

tables.py

…

urls.py

food inherit attributes

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