Anatoly fd2c1e0ca6 Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148 ... # Conflicts: # apps/news/models.py # apps/news/serializers.py # apps/news/views.py # project/settings/production.py		2019-10-23 15:37:14 +03:00
..
management	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00
migrations	Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148	2019-10-23 15:37:14 +03:00
serializers	Revert "Password reset confirmation mechanics"	2019-10-14 15:53:40 +03:00
tests	Test	2019-10-09 16:28:14 +03:00
urls	Revert "Password reset confirmation mechanics"	2019-10-14 15:53:40 +03:00
views	Merge branch 'develop' into feature/gm-192	2019-10-15 11:47:14 +03:00
__init__.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00
admin.py	Add establishment manager role	2019-10-16 11:40:51 +03:00
apps.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00
forms.py	added endpoint to account app; added "email_confirmed" field to User model; refactored auth app;	2019-08-20 15:43:59 +03:00
models.py	Merge branch 'develop' into feature/gm-148	2019-10-23 12:00:58 +03:00
tasks.py	Merge branch 'develop' into feature/gm-148	2019-10-14 18:19:46 +03:00