Sylvain 7ca1c841b6 Merge branch 'dev' into english ...

Conflicts:
	README.md
	app/assets/templates/shared/leftnav.html.erb

2016-01-27 11:09:58 +01:00

..

images

init depot fabmanager

2015-05-05 03:10:25 +02:00

javascripts

removed unused JS includes (fr only)

2016-01-18 15:23:35 +01:00

stylesheets

[bug] #2

2015-10-28 11:55:54 +01:00

templates

Merge branch 'dev' into english

2016-01-27 11:09:58 +01:00