finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop

Browse source 
# Conflicts:
#	modules/bindata/bindata.go
This commit is contained in:
Unknwon 2015-09-10 14:55:29 -04:00
commit cbd6276200
10 changed files with 211 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

1
conf/locale/locale_en-US.ini
View file

@ -817,6 +817,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