diff options
author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-13 13:16:58 +0800 |
---|---|---|
committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-13 13:16:58 +0800 |
commit | 3005a0f13e8861c79e3ea84ce480124fbc3c181d (patch) | |
tree | 697744073f5ae556cec2f2f122f3852e87f2a331 /web.go | |
parent | f2ce1eebbb281e978b1e3fa903a43aa94c11c387 (diff) | |
parent | d093406634f2896459d5abf5c7f6d2fd98c0812b (diff) | |
download | gitea-3005a0f13e8861c79e3ea84ce480124fbc3c181d.tar.gz gitea-3005a0f13e8861c79e3ea84ce480124fbc3c181d.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
routers/repo/single.go
templates/repo/single.tmpl
Diffstat (limited to 'web.go')
-rw-r--r-- | web.go | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -78,6 +78,8 @@ func runWeb(*cli.Context) { //m.Get("/:username/:reponame", repo.Repo) + //m.Get("/:username/:reponame", repo.Repo) + listenAddr := fmt.Sprintf("%s:%s", base.Cfg.MustValue("server", "HTTP_ADDR"), base.Cfg.MustValue("server", "HTTP_PORT", "3000")) |