Files
yii/tests/framework/db/data/models2.php
resurtm c1161ad73e Merge branch 'master' of github.com:yiisoft/yii into fixes-2336
Conflicts:
	CHANGELOG
	tests/framework/db/ar/CActiveRecord2Test.php
2013-05-28 21:06:37 +06:00

5.3 KiB