Anatoly 471239983e Merge branch 'develop' into feature/guides ... # Conflicts: # apps/collection/views/back.py # apps/transfer/models.py		2019-12-17 14:47:26 +03:00
..
management	fix recipe duplicates	2019-12-17 11:54:50 +03:00
serializers	Merge branch 'develop' into feature/guides	2019-12-17 14:47:26 +03:00
__init__.py	Switch application	2019-10-02 11:41:14 +03:00
admin.py	Switch application	2019-10-02 11:41:14 +03:00
apps.py	Switch application	2019-10-02 11:41:14 +03:00
mixins.py	finalizing transfer guides	2019-12-04 14:21:54 +03:00
models.py	Merge branch 'develop' into feature/guides	2019-12-17 14:47:26 +03:00
tests.py	Add news serializer	2019-10-20 17:59:18 +03:00
utils.py	Add flag updates with command python manage.py transfer --update_country_flag	2019-10-31 17:47:31 +03:00
views.py	Switch application	2019-10-02 11:41:14 +03:00