Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'validator-renamed-interfaces' of https://github.com/pro…
Browse files Browse the repository at this point in the history 
…lic/zf2 into feature/zen27-validator

Conflicts:
	library/Zend/Captcha/AdapterInterface.php
  • Loading branch information
@weierophinney
weierophinney committed May 7, 2012
40 parents 8fefc9f + c69aca3 + f80e645 + 29423ab + c158130 + 67b60cf + f95516e + c024fe1 + 23018ea + d283605 + d913f72 + 2b48cb0 + ce789aa + b1b6338 + 99e328f + b4fd322 + b8ab939 + 66f51dc + 3894dbf + 07d1ba6 + bbae534 + 122c95e + 163c973 + 369dd16 + 3db8954 + 6bd897d + a569f01 + 51538e6 + 137636e + 2f69c79 + db66d00 + 1e2b768 + 70cdf50 + d36eb75 + 9c94642 + 8764cd3 + 2d87bdc + f81f3fd + 0d5813e + 5479fef commit 725898b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Filter/Validator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

use Zend\Log\Exception,
Zend\Log\Filter,
Zend\Validator\Validator as ZendValidator;
Zend\Validator\ValidatorInterface as ZendValidator;

/**
* @category Zend
Expand Down

0 comments on commit 725898b

Please sign in to comment.