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
repo.go
setting.go
user.go	Merge branch 'master' of github.com:gogits/gogs	2014-03-15 20:39:56 +08:00