Merge branch 'develop' into feature/react_test

Browse Source

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

...

This commit is contained in:

Yuriy Kulakov

2021-05-27 19:35:59 +03:00

parent f803b35f4e 385d75de3e

commit 0a85ddacd2

24 changed files with 727 additions and 281 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