Merge branch 'add-tests' of github.com:suralc/yii2 into suralc-add-tests
Conflicts: framework/yii/validators/RegularExpressionValidator.php
Showing
This diff is collapsed.
Please register or sign in to comment
Conflicts: framework/yii/validators/RegularExpressionValidator.php