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	Country id	2019-10-15 10:05:31 +03:00
serializers	Fix country and comment role	2019-10-25 10:59:31 +03:00
urls	Test	2019-10-09 16:28:14 +03:00
views	Fix country admin	2019-10-25 12:42:01 +03:00
__init__.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
admin.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
apps.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
models.py	Fix country_id	2019-10-15 15:20:44 +03:00
tests.py	Fix merge	2019-10-25 15:56:02 +03:00
transfer.py	the fix of types fields in all apps	2019-10-15 13:23:31 +05:00