Etienne Roudeix ee6a2a645f Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-07-26 15:45:26 +02:00

..

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

faker.php

change getting propel connection

2013-07-05 12:57:04 +02:00

insert.sql

address loop

2013-07-26 15:41:46 +02:00

INSTALL-TODO.txt

Added DataAccess plugin, admin header completed

2013-07-25 22:59:46 +02:00

thelia.sql

address loop

2013-07-26 15:41:46 +02:00