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
..
__init__.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
back.py	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
common.py	refactored comments	2019-09-06 11:06:02 +03:00
mobile.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00
web.py	replace comment model from establishment app, added new app comment	2019-09-04 18:47:06 +03:00