Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +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
_ie_lt_10.html.haml	IE 9 alert	2016-08-30 11:42:33 +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
_navbar.html.haml	New color for navbar	2016-11-15 14:10:43 +01:00
application.html.haml	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +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