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

..

Alchemy/Phrasea

Merge branch '3.8'

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

classes

Merge pull request #794 from nlegoff/fix1562

2013-11-22 00:20:29 -08:00

conf.d

Remove DoctrineFixtures mechanism

2013-11-22 15:14:40 +01:00

Fixtures

Rename files

2012-09-19 15:39:29 +02:00

autoload.php

Update autoloader path

2013-05-31 11:40:52 +02:00