Manuel Raynaud c540bf5b09 Merge branch 'rewrite_routing' ...

Conflicts:
	core/lib/Thelia/Controller/Front/UrlRewritingController.php

2013-09-06 07:51:21 +02:00

..

lib/Thelia

Merge branch 'rewrite_routing'

2013-09-06 07:51:21 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00