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

..

adm_ruleset.html

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

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

index.html

Added base html

2021-02-07 15:02:08 +03:00

profile.html

Profile view page refactoring

2021-03-04 20:01:10 +03:00

stat.html

fix bag

2021-03-11 18:14:57 +03:00

work.html

Fixed info bug on page

2021-03-06 01:36:19 +03:00