CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/react_test

Browse Source 
# Conflicts:
#	static/main/js/control_page/control.js
This commit is contained in:
Yuriy Kulakov
2021-04-29 16:52:31 +03:00
parent 760d28a768 96e5865d3b
commit 82fde03db9
12 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -31,7 +31,6 @@ logs/
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/