slene a33d03f008 Merge branch 'master' of github.com:gogits/gogs ...

Conflicts:
	routers/user/user.go
	web.go

2014-03-15 20:39:56 +08:00

..

auth.go

Allow 1 letter usernames

2014-03-13 16:21:16 -04:00

repo.go

…

setting.go

…

user.go

Merge branch 'master' of github.com:gogits/gogs

2014-03-15 20:39:56 +08:00