Manuel Raynaud 3c87fa8bd0 Merge branch 'master' into cart ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php

2013-08-07 10:23:44 +02:00

..

Action

fix argument call

2013-08-07 09:57:54 +02:00

Command

refacto cart process

2013-07-26 10:43:17 +02:00

Controller

Fix source header alignment

2013-07-17 15:06:53 +02:00

Core

Merge branch 'master' into cart

2013-08-07 10:23:44 +02:00

Fixtures/Dumper/Config

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

Form

manu le bossu's backup

2013-07-30 09:04:41 +02:00

Log

Fix source header alignment

2013-07-17 15:06:53 +02:00

Type

Merge branch 'master' into loops

2013-07-23 10:44:41 +02:00

bootstrap.php

set execution right // no more troubles

2013-06-20 15:21:16 +02:00