Yuriy Kulakov d300cc2f06 Merge branch 'develop' into feature/periodic ...

# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py

2021-03-12 15:37:50 +03:00

..

css

done!

2021-02-18 20:51:34 +03:00

img

add some design to menu template(logo and color)

2021-03-12 14:39:51 +03:00

js

Fixed bug with disappearance of table rows in control page at start

2021-03-12 14:54:57 +03:00