Merge remote-tracking branch 'astaxie/master'

ba94479e · 傅小黑 · ba3a9bee · fc19f8f1 · ba94479e · ba94479e
Commit ba94479e authored Dec 24, 2013 by 傅小黑
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

log.go log.go +0 -0

Orm.md orm/docs/zh/Orm.md +1 -1

No files found.
--- a/log.go
+++ b/log.go
--- a/orm/docs/zh/Orm.md
+++ b/orm/docs/zh/Orm.md
@@ -145,7 +145,7 @@ import "github.com/astaxie/beego/orm"

 type User struct {
 	Id   int
-	name string
+	Name string
 }

 func init(){