Xavier J 285d7c6fa0 Merge branch 'develop' into france_connect ... # Conflicts: # db/schema.rb		2015-10-08 16:54:21 +02:00
..
images	Logo france connect navbar	2015-10-08 12:11:01 +02:00
javascripts	activation page carte for procedure with db attribut use_api_carto is true	2015-09-28 18:55:16 +02:00
stylesheets	Logo france connect navbar	2015-10-08 12:11:01 +02:00