Benjamin Perche 7ccb32badb Remove conflicts ...

modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php

2014-08-01 12:48:01 +02:00

..

lib/Thelia

Remove conflicts

2014-08-01 12:48:01 +02:00

bootstrap.php

various fixes from insight

2014-06-18 09:33:32 +02:00