Merge branch 'master' into dist/eole/2.7.2/master

This commit is contained in:
Philippe Caseiro 2020-11-20 14:45:38 +01:00
commit 0a5f0f7d94

View File

@ -392,10 +392,12 @@
"oidcOPMetaDataJWKS": null, "oidcOPMetaDataJWKS": null,
"webIDAuthnLevel": 1, "webIDAuthnLevel": 1,
"issuerDBOpenIDActivation": "1", "issuerDBOpenIDActivation": "1",
%if %%is_empty(%%llResetUrl) %if %%llResetPassword == "oui"
%if %%is_empty(%%llResetUrl)
"mailUrl": "https://%%authWebName/mail.pl", "mailUrl": "https://%%authWebName/mail.pl",
%else %else
"mailUrl": "%%llResetUrl", "mailUrl": "%%llResetUrl",
%end if
%end if %end if
"maintenance": 0, "maintenance": 0,
"jsRedirect": 0, "jsRedirect": 0,