Andrew Smirnov 8b70827f07

Merge branch 'develop' into feature/react_test ...

# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js

2021-05-13 20:02:27 +03:00

..

__init__.py

Initial commit. Add django.

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

asgi.py

tmp commit

2021-04-06 18:04:13 +03:00

auth.py

update login with email

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

settings.py

Add registration tests

2021-05-05 23:44:24 +00:00

urls.py

Feature/tests/make_eng from work and control pages

2021-05-06 15:22:57 +00:00

wsgi.py

Initial commit. Add django.

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