Xavier J 8ca2b53775 Merge branch 'franceconnect_local' into develop ... # Conflicts: # app/assets/javascripts/application.js		2016-01-29 11:43:31 +01:00
..
images	Merge branch 'franceconnect_local' into develop	2016-01-29 11:43:31 +01:00
javascripts	Merge branch 'franceconnect_local' into develop	2016-01-29 11:43:31 +01:00
stylesheets	Merge branch 'franceconnect_local' into develop	2016-01-29 11:43:31 +01:00