Commit 1fa802a1 authored by Qiang Xue's avatar Qiang Xue

Merge branch 'master' of github.com:yiisoft/yii2

Conflicts:
	framework/yii/db/ActiveQuery.php
parents 9ceaf3bd 9d73048b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment