Merge branch 'develop' into feature/react_test

Browse Source

# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js

...

This commit is contained in:

Andrew Smirnov

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

parent e32f12019e 796ffb0898

commit 8b70827f07

16 changed files with 1029 additions and 334 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

static/main/js/control.js Normal file