Dmitriy Kuzmenko 638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix ... # Conflicts: # apps/establishment/admin.py # project/settings/base.py		2019-10-30 19:12:59 +03:00
..
migrations	Recipe list&detail api-endpoints	2019-09-19 14:22:40 +03:00
serializers	added in_favorites to recipe endpoints	2019-09-19 14:55:50 +03:00
urls	Recipe list&detail api-endpoints	2019-09-19 14:22:40 +03:00
views	added in_favorites to recipe endpoints	2019-09-19 14:55:50 +03:00
__init__.py	Recipe app&model	2019-09-19 11:57:58 +03:00
apps.py	Recipe app&model	2019-09-19 11:57:58 +03:00
models.py	gm-259, gm-260, gm-261	2019-10-29 17:16:39 +03:00
tests.py	remove print from tests	2019-10-25 11:04:40 +03:00
transfer_data.py	added transfer for recipe app	2019-10-23 14:42:08 +05:00
transfer.py	the fix of types fields in all apps	2019-10-15 13:23:31 +05:00