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

..

css

merge take tickets

2021-04-15 18:47:58 +03:00

img

add some design to menu template(logo and color)

2021-03-12 14:39:51 +03:00

js

Merge branch 'develop' into feature/react_test

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