Etienne Roudeix 66536d0b31 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php

2013-09-18 20:03:13 +02:00

..

Config

fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar

2013-09-18 19:51:01 +02:00

DataCollector

fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar

2013-09-18 19:51:01 +02:00

Listeners

fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar

2013-09-18 19:51:01 +02:00

Smarty/Plugin

Merge branch 'master' into template

2013-09-18 20:03:13 +02:00

TheliaDebugBar.php

fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar

2013-09-18 19:51:01 +02:00