Commit c150935a by Czémán Arnold

Merge branch 'master' into issue_477

requirements: upgrade ldap packages
settings: remove NISGroupType

Conflicts:
	circle/dashboard/models.py
	requirements/base.txt
parents 1746ed9a aa92a44d
Pipeline #654 passed with stage
in 0 seconds