Merge branch 'cleanmaster' into modules

2013-12-12 15:45:45 +01:00
parent 6acb1924d8 65df33d0b7
commit 297f197fed
19 changed files with 290 additions and 23 deletions
--- a/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
+++ b/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
@@ -3,6 +3,7 @@ namespace Thelia\Tests\Action;

 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\Base\ProductQuery;
 use Thelia\Model\Base\RewritingUrlQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\ProductQuery;