# Conflicts:
#	config/fake.go
#	config/xml/xml_test.go
#	config/yaml/yaml_test.go

orm: inline struct support

fix json extra newline

multiple response.WriteHeader calls

Add layout rebuilding on each request in dev mode

https://github.com/astaxie/beego/pull/1719

Log enhancement

add ssdb cache adapter

Fix cookies in accordance with the "net / http" and Flash usage

fix #1669 and return IO error

# Conflicts:
#	config.go

Fixed #1735 Return nil if config value does not exist or is empty

static file map race bug fixed

Update phone regexp

fix template  read-write lock race