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

…

auth_form.go

Added LDAP simple auth support.

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

auth.go

…

org.go

…

repo_form.go

…

user_form.go

…