Anatoly 25c63b8097 Merge branch 'develop' into feature/roles ... # Conflicts: # apps/account/models.py # apps/collection/views/back.py # apps/comment/views/back.py # apps/establishment/models.py # apps/establishment/views/back.py # apps/news/views.py # apps/partner/views/back.py		2020-01-30 10:56:46 +03:00
..
management	fix comments	2020-01-15 22:31:30 +03:00
migrations	fix comments	2020-01-15 22:31:30 +03:00
serializers	slug from content object	2020-01-28 12:16:18 +00:00
urls	fix route	2020-01-28 13:56:32 +00:00
views	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
__init__.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
admin.py	fix comment country	2019-11-12 16:19:03 +03:00
apps.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
models.py	tune get comments method	2020-01-28 12:05:30 +00:00
tests.py	Fix comment test and permission	2019-11-25 12:13:14 +03:00
transfer_data.py	fix comments	2020-01-15 22:31:30 +03:00
transfer.py	the fix of types fields in all apps	2019-10-15 13:23:31 +05:00