From: Unknown <joe2010xtmf@163.com>
Date: Sun, 16 Mar 2014 06:28:28 +0000 (-0400)
Subject: Merge branch 'master' of github.com:gogits/gogs
X-Git-Tag: v0.9.99~2426^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=50df58a893b745abff74bdcbb9be3fc0d10d21f4;p=gitea.git

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

50df58a893b745abff74bdcbb9be3fc0d10d21f4
diff --cc gogs.go
index 08421f0055,3b33c4e303..315297b101
--- a/gogs.go
+++ b/gogs.go
@@@ -49,7 -49,10 +49,8 @@@ func main() 
  	app.Commands = []cli.Command{
  		CmdWeb,
  		CmdServ,
+ 		CmdUpdate,
  	}
 -	app.Flags = append(app.Flags, []cli.Flag{
 -		cli.BoolFlag{"noterm", "disable color output"},
 -	}...)
 +	app.Flags = append(app.Flags, []cli.Flag{}...)
  	app.Run(os.Args)
  }