Xavier J 721ea424ed Merge branch 'develop' of github.com:sgmap/tps into develop ... # Conflicts: # app/views/admin/procedures/_modal_publish.html.haml		2016-06-30 14:17:33 +02:00
..
accompagnateurs_controller.rb	Admin can add new Accompagnateur directly on the procedure	2016-05-26 16:44:10 +02:00
gestionnaires_controller.rb	Admin can add new Accompagnateur directly on the procedure	2016-05-26 16:44:10 +02:00
pieces_justificatives_controller.rb	Add ordering feature on piece justificative view	2016-06-08 16:45:37 +02:00
previsualisations_controller.rb	Fix bug revisualization controller	2016-06-14 11:59:50 +02:00
procedures_controller.rb	Merge branch 'develop' of github.com:sgmap/tps into develop	2016-06-30 14:17:33 +02:00
profile_controller.rb	add api token in administrator's profile page	2015-12-15 16:49:48 +01:00
types_de_champ_controller.rb	Add ordering feature on piece justificative view	2016-06-08 16:45:37 +02:00