Commit Graph

4 Commits

Author SHA1 Message Date
Qiang Xue
5357388d24 Merge branch 'master' of dev.yiisoft.com:yii2
Conflicts:
	framework/db/dao/Command.php
	framework/db/dao/Connection.php
	framework/db/dao/Query.php
	framework/db/dao/mysql/Schema.php
	tests/unit/data/config.php
	tests/unit/data/mysql.sql
	tests/unit/framework/db/dao/ConnectionTest.php
2011-10-04 10:00:45 -04:00
Qiang Xue
be87e1780c w 2011-10-04 09:22:26 -04:00
Qiang Xue
5f2f574381 w 2011-09-02 23:47:18 -04:00
Qiang Xue
f082c0eb9a w 2011-09-02 23:47:18 -04:00