Yuriy Kulakov 82fde03db9 Merge branch 'develop' into feature/react_test ...

# Conflicts:
#	static/main/js/control_page/control.js

2021-04-29 16:52:31 +03:00

..

adm_ruleset.html

Merge branch 'develop' into feature/react_test

2021-04-29 16:52:31 +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

change notifications duration

2021-04-26 22:00:38 +03:00