Merge branch 'master' into template

2013-09-17 16:53:57 +02:00
parent 4a6adf532a 7ca3429cbb
commit 21df630d27
44 changed files with 10697 additions and 635 deletions
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -86,6 +86,8 @@ class Thelia extends Kernel
            $serviceContainer->setLogger('defaultLogger', \Thelia\Log\Tlog::getInstance());
            $con->useDebug(true);
        }
+
+
    }

    /**