Franck Allimant db6d5692eb Merge branch 'catalog' ...

Conflicts:
	local/config/schema.xml

2013-10-24 16:47:53 +02:00

..

config

Merge branch 'catalog'

2013-10-24 16:47:53 +02:00

media

Merge branch 'master' into loops

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

modules

Merge branch 'master' into module_management

2013-10-21 09:19:08 +02: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