Manuel Raynaud 23c4a14d2c Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	templates/admin/default/customer-edit.html

2013-10-28 15:41:48 +01:00

..

admin/default

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

2013-10-28 15:41:48 +01:00

default

Merge branch 'master' into frontend

2013-10-25 14:51:34 +02:00

pdf

save website url in install process

2013-10-24 19:45:51 +02:00

.gitkeep

set execution right // no more troubles

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