Franck Allimant ca862b07e4 Merge branch 'master' into brands ...

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

2014-06-26 16:35:08 +02:00

..

I18n

Fixed minor typos

2014-06-19 01:51:39 +02:00

Resources

Merge branch 'master' into brands

2014-06-26 16:35:08 +02:00

DatabaseConfiguration.php

change license header

2014-04-18 09:36:41 +02:00

DefinePropel.php

change license header

2014-04-18 09:36:41 +02:00