Yuriy Kulakov 1fac1b4835 Merge branch 'develop' into feature/adm_ruleset/backend ...

# Conflicts:
#	main/views.py

2021-03-04 18:32:08 +03:00

..

adm_ruleset.html

Added permissions system to control page

2021-03-04 18:22:49 +03:00

index.html

Added base html

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

profile.html

Fix page html code

2021-02-28 17:27:07 +03:00

work.html

Fix page html code

2021-02-28 17:27:07 +03:00