Merge remote-tracking branch 'origin/master'

Conflicts:
	routers/repo/single.go
	templates/repo/single.tmpl
This commit is contained in:
FuXiaoHei 2014-03-13 13:16:58 +08:00
commit 3005a0f13e
1 changed files with 2 additions and 0 deletions

2
web.go
View File

@ -78,6 +78,8 @@ func runWeb(*cli.Context) {
//m.Get("/:username/:reponame", repo.Repo) //m.Get("/:username/:reponame", repo.Repo)
//m.Get("/:username/:reponame", repo.Repo)
listenAddr := fmt.Sprintf("%s:%s", listenAddr := fmt.Sprintf("%s:%s",
base.Cfg.MustValue("server", "HTTP_ADDR"), base.Cfg.MustValue("server", "HTTP_ADDR"),
base.Cfg.MustValue("server", "HTTP_PORT", "3000")) base.Cfg.MustValue("server", "HTTP_PORT", "3000"))