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/Tests/Phrasea

Merge branch '3.8'

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

classes

Fix tests

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

files

Replace old files with new ones

2013-06-28 18:49:47 +02:00

bootstrap.php

Add User Entity

2013-08-23 20:20:24 +02:00

db-ref.sqlite

Update User entity

2013-11-28 18:00:05 +01:00