Xavier J 285d7c6fa0 Merge branch 'develop' into france_connect ... # Conflicts: # db/schema.rb		2015-10-08 16:54:21 +02:00
..
backoffice	Fix tests	2015-09-24 18:33:10 +02:00
dossiers	FAKE changement libelle	2015-10-08 16:33:44 +02:00
gestionnaires/sessions	add login for gestionnaire	2015-09-22 10:15:12 +02:00
layouts	Désactivation de l'obligation de dessin pour l'API carto	2015-10-08 16:26:54 +02:00
test_open_id	start france connect	2015-10-05 16:42:29 +02:00
users	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00