Merge remote-tracking branch 'origin/master'

Conflicts:
	routers/repo/single.go
	templates/repo/single.tmpl
tokarchuk/v1.17
FuXiaoHei 11 years ago
commit 3005a0f13e
  1. 2
      web.go

@ -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"))

Loading…
Cancel
Save