Xavier J 285d7c6fa0 Merge branch 'develop' into france_connect ... # Conflicts: # db/schema.rb		2015-10-08 16:54:21 +02:00
..
show.html.haml	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00