Sokurov Idar 2c14f65d4f Merge branch 'develop' into feature/registration_bug ...

# Conflicts:
#	main/views.py

2021-04-13 22:11:31 +03:00

..

base

Added notificcations about role changes

2021-03-21 19:47:42 +03:00

django_registration

Add new page if email has not sent

2021-04-13 20:58:36 +03:00

pages

Control page displays all users from zendesk and db

2021-04-11 17:35:42 +03:00

registration

Added fixture with base users

2021-03-14 17:54:55 +03:00