Merge branch 'master' of git.yiisoft.com:yii2
Conflicts: framework/db/ar/ActiveFinder.php framework/db/ar/ActiveQuery.php
Showing
Please register or sign in to comment
Conflicts: framework/db/ar/ActiveFinder.php framework/db/ar/ActiveQuery.php