Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
_commentaires_flux.html.haml	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
_modal_upload_pj.html.haml	User and Guest can be upload new documents on our recapitulative dossier page.	2016-03-22 17:36:36 +01:00
show.html.haml	Add locales dynamics (opensimplif)	2016-11-03 16:46:26 +01:00