Tanguy PATTE d6e4a76bf9 Merge branch 'develop' into refactor_type_de_xxx ... Conflicts: db/schema.rb		2015-11-20 17:16:45 +01:00
..
admin	add button save for pj and type de champ	2015-11-20 17:12:36 +01:00
administrateurs/sessions	Add Administrateurs role and his connexion is ok.	2015-10-23 16:19:55 +02:00
backoffice/dossiers	color state on search result	2015-11-19 18:04:09 +01:00
demo	demo procedure page	2015-11-17 18:30:28 +01:00
dossiers	Merge branch 'develop' into leaflet_freedraw	2015-11-19 17:29:23 +01:00
gestionnaires/sessions	Add Administrateurs role and his connexion is ok.	2015-10-23 16:19:55 +02:00
layouts	Add Administrateurs role and his connexion is ok.	2015-10-23 16:19:55 +02:00
users	Merge branch 'develop' into refactor_type_de_xxx	2015-11-20 17:16:45 +01:00