Merge branch 'master' into develop

This commit is contained in:
astaxie
2016-04-05 22:27:20 +08:00
6 changed files with 32 additions and 13 deletions

2
fix.go
View File

@ -12,7 +12,7 @@ import (
var cmdFix = &Command{
UsageLine: "fix",
Short: "fix the beego application to compatibel with beego 1.6",
Short: "fix the beego application to make it compatible with beego 1.6",
Long: `
As from beego1.6, there's some incompatible code with the old version.