DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
app/views/backoffice/dossiers/show.html.haml
View file

@ -4,7 +4,7 @@
%script{type: 'text/javascript'}
="url_carte = '#{@dossier.id}/'"
="ref_dossier = '#{@dossier.ref_dossier}'"
="ref_dossier = '#{@dossier.ref_dossier_carto}'"
= render partial: '/dossiers/infos_entreprise'
%br