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	Merge remote-tracking branch 'origin/develop' into origin/migration_fix	2019-10-30 19:12:59 +03:00
serializers	added WineAppellation model	2019-10-28 12:33:48 +03:00
urls	Feature/cities by country	2019-10-22 13:00:22 +00:00
views	Fix IsContentPageManager	2019-10-25 15:25:35 +03:00
__init__.py	version 0.0.4: add app locations with models City, Regions, Address, Countries	2019-08-08 17:06:07 +03:00
admin.py	added WineAppellation model	2019-10-28 12:33:48 +03:00
apps.py	version 0.0.4: add app locations with models City, Regions, Address, Countries	2019-08-08 17:06:07 +03:00
models.py	Merge remote-tracking branch 'origin/develop' into origin/migration_fix	2019-10-30 19:12:59 +03:00
tests.py	Fix merge	2019-10-25 15:56:02 +03:00
transfer_data.py	Move address transfer to dictionaries	2019-10-28 10:14:11 +03:00
transfer.py	Fix queryset conditions	2019-10-28 00:15:37 +03:00