Yuriy Kulakov 918306aa48 Merge branch 'develop' into feature/adm_ruleset/backend ...

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

2021-02-25 18:41:08 +03:00

..

base

done!

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

django_registration

fix bug, update registration

2021-02-19 17:55:27 +03:00

pages

Added user list function

2021-02-23 19:46:43 +03:00

registration

merge registration branch

2021-02-25 14:17:36 +03:00