Merge remote-tracking branch 'ldap/master' into Develop
# Conflicts: # cps/server.py # cps/templates/config_edit.html # cps/ub.py # cps/updater.py # cps/web.py # optional-requirements-ldap.txt # setup.cfg
Showing
cps/ldap.py
0 → 100644
... | @@ -18,6 +18,7 @@ python-Levenshtein>=0.12.0 | ... | @@ -18,6 +18,7 @@ python-Levenshtein>=0.12.0 |
# ldap login | # ldap login | ||
python_ldap>=3.0.0 | python_ldap>=3.0.0 | ||
flask-simpleldap | |||
# extracting metadata | # extracting metadata | ||
lxml>=3.8.0 | lxml>=3.8.0 | ||
... | ... |
Please
register
or
sign in
to comment