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

..

control_page

Added control page tests and fixed bugs

2021-05-07 22:29:50 +03:00

control.js

Merge branch 'develop' into feature/react_test

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

notifications.js

Add notifications on work page, rebase already exists with notifications.js

2021-04-20 22:55:22 +03:00