Sergio Benitez aa9c36514f Merged conflicts. 10 lat temu
..
apiv1 590c464c56 UI: create issue with title and content 10 lat temu
ldap 2d1db4bf05 Added LDAP simple auth support. 10 lat temu
pam 81adbe17ca use pam and update TRANSLATORS 10 lat temu
admin.go 07fe846c9f #1579 change e-mail max length to 254 10 lat temu
auth.go 65e73c4ac6 support URL param to token, but still restrict to APIs 10 lat temu
auth_form.go 2d1db4bf05 Added LDAP simple auth support. 10 lat temu
org.go 487fc8ca39 fix #1439 10 lat temu
repo_form.go 38eb000d13 work on #1570 10 lat temu
user_form.go 07fe846c9f #1579 change e-mail max length to 254 10 lat temu