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

Commit

Permalink
Merge branch 'zendStudioDLTKProblems' of https://github.com/marc-mabe…
Browse files Browse the repository at this point in the history 
…/zf2 into hotfix/coding-standards

Conflicts:
	library/Zend/Mvc/Controller/ActionController.php
	library/Zend/Mvc/Controller/RestfulController.php
  • Loading branch information
@weierophinney
weierophinney committed Feb 22, 2012
36 parents 4681cd6 + 5b66a63 + 5ab46dd + e59b115 + 76643a9 + c3c4da3 + f86842a + c09b55e + 44b848c + 5a4da57 + d43bca0 + cd5dffb + 5d7867c + 1f8bc83 + c5ab2f3 + 7a52da4 + bb2812c + f7972b4 + 0abbe02 + aefc063 + b47bdc4 + 8b3028a + 1b8822c + 4030a36 + ca4117d + a3994fc + 370778a + 759aeb3 + c30b3a1 + adc7329 + 612a636 + 32d2e16 + 341bf73 + e7e036f + 78908ef + fd21189 commit 2aa633d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
*/
namespace Zend\Captcha;

use Zend\Config\Config;
use Traversable,
Zend\Config\Config;

/**
* Base class for Captcha adapters
Expand Down

0 comments on commit 2aa633d

Please sign in to comment.