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

..

setting.go

add draft page for empty link

2014-03-14 17:12:28 +08:00

user.go

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

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