Merge branch 'master' of github.com:yiisoft/yii2
Conflicts: framework/composer.json
Showing
framework/yii/jui/Dialog.php
0 → 100644
framework/yii/jui/Menu.php
0 → 100644
framework/yii/jui/Tabs.php
0 → 100644
Please register or sign in to comment