Yuriy Kulakov 0a85ddacd2 Merge branch 'develop' into feature/react_test ...

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

2021-05-27 19:35:59 +03:00

..

__init__.py

Initial commit. Add django.

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

asgi.py

Use pylint for some files

2021-04-28 18:57:36 +03:00

auth.py

Pylint 10

2021-05-12 20:34:52 +03:00

settings.py

Merge branch 'develop' into feature/react_test

2021-05-27 19:35:59 +03:00

urls.py

Merge branch 'develop' into feature/documentation

2021-05-23 11:51:41 +03:00

wsgi.py

Initial commit. Add django.

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