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

..

adm_ruleset.html

Added control page tests and fixed bugs

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

index.html

Added base html

2021-02-07 15:02:08 +03:00

profile.html

Add password change page

2021-04-26 21:47:45 +03:00

statistic.html

merge st_button

2021-04-19 13:39:43 +03:00

work.html

Add get tickets tests

2021-05-13 04:49:02 +00:00