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

# Conflicts:
#	main/views.py

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

..

base

Added permissions system to control page

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

django_registration

fix bug, update registration

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

pages

Merge branch 'develop' into feature/adm_ruleset/backend

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

registration

Added engineers and light_agents count from organization to control page

2021-02-25 21:57:04 +03:00