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

Browse Source

# Conflicts:
#	cps/admin.py

...

This commit is contained in:

Ozzieisaacs 2020-12-03 16:02:38 +01:00

parent cb1ebc1cd0 1ca4583896

commit 22dde5d18e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available