Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00
parent 681ac83334 315ed1fb09
commit d6ba2b3d65
42 changed files with 541 additions and 64 deletions
--- a/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
+++ b/core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
@@ -3,8 +3,8 @@ 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\ProductQuery;
+use Thelia\Model\RewritingUrlQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Rewriting\RewritingResolver;
 use Thelia\Tools\URL;