Commit Graph

2 Commits

Author SHA1 Message Date
Lunny Xiao 5080b2b571 Merge branch 'master' into dev
Conflicts:
	dialects/oracle.go
	dialects/postgres.go
	docs/QuickStart.md
	engine.go
	mysql.go
	session.go
	statement.go
	table.go
	tests/base_test.go
	xorm.go
	xorm/go.go
	xorm/reverse.go
2014-04-11 15:37:27 +08:00
Lunny Xiao 4df43ffa0f new architecture 2014-01-07 17:33:27 +08:00