requirements: upgrade ldap packages settings: remove NISGroupType Conflicts: circle/dashboard/models.py requirements/base.txt
Merge branch 'master' into issue_477 · c150935a