Xavier J 8ca2b53775 Merge branch 'franceconnect_local' into develop ... # Conflicts: # app/assets/javascripts/application.js		2016-01-29 11:43:31 +01:00
..
_etape_suivante.html.haml	Désactivation de l'obligation de dessin pour l'API carto	2015-10-08 16:26:54 +02:00
_modifications_terminees.html.haml	Désactivation de l'obligation de dessin pour l'API carto	2015-10-08 16:26:54 +02:00
application.html.haml	Merge branch 'franceconnect_local' into develop	2016-01-29 11:43:31 +01:00
mailer.html.haml	Add mailer Welcome	2015-12-14 16:09:20 +01:00
mailer.text.haml	Add mailer Welcome	2015-12-14 16:09:20 +01:00