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

..

control_page

Merge branch 'develop' into feature/react_test

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

notifications.js

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

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