franck a51ffb7a67 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	templates/admin/default/admin-layout.tpl

2013-09-10 15:46:51 +02:00

..

Resources

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

2013-09-10 15:46:51 +02:00

DatabaseConfiguration.php

…

DefinePropel.php

…