Commit 22dde5d1 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into Develop

# Conflicts:
#	cps/admin.py
parents cb1ebc1c 1ca45838
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment