Manuel Raynaud 5afc54096a Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	composer.lock

2013-05-16 19:07:34 +02:00

..

lib/Thelia

Merge branch 'master' of github.com:thelia/thelia

2013-05-16 19:07:34 +02:00

bootstrap.php

rename plugins to modules

2013-05-16 11:13:09 +02:00