1
1
mirror of https://github.com/go-gitea/gitea synced 2025-08-12 20:48:20 +00:00

Merged conflicts.

This commit is contained in:
Sergio Benitez
2015-09-04 20:49:07 -07:00
9 changed files with 350 additions and 322 deletions

View File

@@ -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