Franck Allimant 8970b0614f Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	install/thelia.sql

2014-01-27 17:13:43 +01:00

..

.gitkeep

set execution right // no more troubles

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

.htaccess

set execution right // no more troubles

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

build.properties.sample

fix psr

2014-01-22 12:52:36 +01:00

database.yml.sample

fix psr

2014-01-22 12:52:36 +01:00

schema.xml

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

2014-01-27 17:13:43 +01:00