Merge pull request #192 from DerDackel/ldapssl

author Lunny Xiao <xiaolunwen@gmail.com>

Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)

committer Lunny Xiao <xiaolunwen@gmail.com>

Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)
author Lunny Xiao <xiaolunwen@gmail.com>
Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)
committer Lunny Xiao <xiaolunwen@gmail.com>
Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)
diff --cc modules/auth/authentication.go
Simple merge
diff --cc modules/base/conf.go
Simple merge
diff --cc routers/admin/auths.go
Simple merge
diff --cc templates/admin/auths/edit.tmpl
Simple merge
diff --cc templates/admin/auths/new.tmpl
Simple merge
author	Lunny Xiao <xiaolunwen@gmail.com>
	Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)
committer	Lunny Xiao <xiaolunwen@gmail.com>
	Thu, 15 May 2014 12:52:05 +0000 (20:52 +0800)
		1	2
modules/auth/authentication.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/base/conf.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/admin/auths.go	patch \|	diff1 \|	diff2 \|	blob \| history
templates/admin/auths/edit.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history
templates/admin/auths/new.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history