Sokurov Idar 4a604f0941 Merge branch 'develop' into feature/statistic/backend ...

# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py

2021-03-04 23:16:21 +03:00

..

__init__.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

asgi.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

auth.py

update login with email

2021-03-02 21:44:13 +03:00

settings.py

Merge branch 'develop' into feature/registration

2021-03-02 21:53:43 +03:00

urls.py

Merge branch 'develop' into feature/statistic/backend

2021-03-04 23:16:21 +03:00

wsgi.py

Initial commit. Add django.

2021-02-04 20:01:35 +03:00