1
0
mirror of https://github.com/astaxie/beego.git synced 2025-07-12 00:21:01 +00:00

Merge branch 'astaxie/develop' into environmentVar

# Conflicts:
#	config/fake.go
#	config/xml/xml_test.go
#	config/yaml/yaml_test.go
This commit is contained in:
ysqi
2016-03-10 19:57:16 +08:00
52 changed files with 1205 additions and 336 deletions

View File

@ -75,6 +75,7 @@ password = $ENV_GOROOT
"null": "",
"demo2::key1": "",
"error": "",
"emptystrings": []string{},
}
)