Etienne Roudeix 84204cbf05 Merge branch 'master' into template ...

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

2013-09-16 15:32:17 +02:00

..

routing

Merge branch 'master' into template

2013-09-16 15:32:17 +02:00

action.xml

Finished Features management

2013-09-16 10:40:52 +02:00

config.xml

- Edit country view creation

2013-09-16 12:55:34 +02:00

routing.xml

create router for rewriting matching

2013-09-05 20:46:46 +02:00