Commit Graph
5 Commits
Author SHA1 Message Date
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
Yuriy Kulakov 760d28a768 Update package.json 2021-04-29 16:33:41 +03:00
Yuriy Kulakov 3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Yuriy Kulakov 746a2c2543 small fixes 2021-04-25 20:17:02 +03:00
Yuriy Kulakov 5bd37d2203 Added first templates of react tests 2021-04-25 19:58:56 +03:00