• Qiang Xue's avatar
    Merge branch 'master' of dev.yiisoft.com:yii2 · 5357388d
    Qiang Xue authored
    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
    5357388d
config.php 180 Bytes