Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Conflicts:
	app/views/dossiers/_infos_dossier.html.haml
This commit is contained in:
Tanguy PATTE 2015-09-22 15:02:04 +02:00
commit d034176fe3
24 changed files with 143 additions and 109 deletions

View file

@ -4,7 +4,6 @@ fr:
dossier: 'Dossier'
attributes:
dossier:
mail_contact: 'Le mail de contact'
nom_projet: 'Le nom du projet'
description: 'La description'
montant_projet: 'Le montant du projet'