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

..

apps

Merge branch '3.8'

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

common

Fix JS codestyle

2013-11-12 12:49:23 +01:00

models

Fix JS codestyle

2013-11-12 12:49:23 +01:00

tests

Merge branch '3.8'

2013-11-12 13:26:15 +01:00