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

Conflicts:
	install/thelia.sql

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

..

config

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

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

media

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

modules

Fixed TaxEngine usage.

2014-01-23 12:06:14 +01:00

session

set execution right // no more troubles

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

.gitkeep

set execution right // no more troubles

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