diff options
| author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-04 20:49:07 -0700 |
|---|---|---|
| committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-04 20:49:07 -0700 |
| commit | aa9c36514f5134c066866cee0da87f361903826d (patch) | |
| tree | 9c648f632c034259b4af74eff58df0707e048758 /conf | |
| parent | 07fe846c9f64c1b68ed55b42b523c50bf3c23c34 (diff) | |
| parent | 2d1db4bf055a425bf4529b2f9f0378d58e3ec648 (diff) | |
| download | gitea-aa9c36514f5134c066866cee0da87f361903826d.tar.gz gitea-aa9c36514f5134c066866cee0da87f361903826d.zip | |
Merged conflicts.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 1484cdbe47..88a6e4c9a6 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -814,6 +814,7 @@ auths.port = Port auths.bind_dn = Bind DN auths.bind_password = Bind Password auths.user_base = User Search Base +auths.user_dn = User DN auths.attribute_name = First name attribute auths.attribute_surname = Surname attribute auths.attribute_mail = E-mail attribute |