Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword

author Lunny Xiao <xiaolunwen@gmail.com>

Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)

committer Lunny Xiao <xiaolunwen@gmail.com>

Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)
author Lunny Xiao <xiaolunwen@gmail.com>
Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)
committer Lunny Xiao <xiaolunwen@gmail.com>
Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)
diff --cc models/user.go
Simple merge
diff --cc routers/api/v1/repo.go
Simple merge
author	Lunny Xiao <xiaolunwen@gmail.com>
	Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)
committer	Lunny Xiao <xiaolunwen@gmail.com>
	Fri, 24 Apr 2015 07:03:21 +0000 (15:03 +0800)
		1	2
models/user.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/api/v1/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history