Romain Neutron 4f31cfeefc Merge branch '3.8' ...

Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig

2013-12-02 18:17:38 +01:00

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

Merge branch '3.8'

2013-11-12 19:19:13 +01:00

scripts

Merge branch '3.8'

2013-12-02 18:17:38 +01:00

skins

Merge branch '3.8'

2013-12-02 18:17:38 +01:00

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00

crossdomain.xml

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

favicon.ico

initial import

2011-02-16 16:09:48 +01:00

index_dev.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00

index.php

Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD

2013-11-05 10:53:32 +01:00