Sergio Benitez aa9c36514f Merged conflicts.

2015-09-04 20:49:07 -07:00

..

apiv1

…

ldap

Added LDAP simple auth support.

2015-09-04 20:48:34 -07:00

pam

…

admin.go

#1579 change e-mail max length to 254

2015-09-04 10:59:34 -04:00

auth_form.go

Added LDAP simple auth support.

2015-09-04 20:48:34 -07:00

auth.go

support URL param to token, but still restrict to APIs

2015-09-02 02:45:01 -04:00

org.go

…

repo_form.go

work on #1570

2015-09-03 08:09:08 -04:00

user_form.go

#1579 change e-mail max length to 254

2015-09-04 10:59:34 -04:00