Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-22 06:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge from master

Browse Source
This commit is contained in:
cuiliang
2016-06-11 20:16:28 +08:00
parent 7fd063c8a9
commit c0df003ac0
530 changed files with 5 additions and 54272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/framework/data/ArrayDataProviderTest.php
View File

@@ -179,8 +179,4 @@ class ArrayDataProviderTest extends TestCase
$dataProvider = new ArrayDataProvider(['allModels' => $mixedArray, 'pagination' => $pagination]);
$this->assertEquals(['key1', 9], $dataProvider->getKeys());
}
<<<<<<< HEAD
}
=======
}
>>>>>>> master