demarches-normaliennes/app/controllers/users
Xavier J 8693f4194c Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop
Conflicts:
	app/views/users/recapitulatif/show.html.haml
	spec/features/recapitulatif_page/_commentaires_flux_spec.rb
	spec/features/recapitulatif_page/show_page_spec.rb
2015-09-24 10:56:12 +02:00
..
commentaires_controller.rb move controller into users folder 2015-09-23 19:20:03 +02:00
confirmations_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00
description_controller.rb move controller into users folder 2015-09-23 19:20:03 +02:00
dossiers_controller.rb move controller into users folder 2015-09-23 19:20:03 +02:00
omniauth_callbacks_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00
passwords_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00
recapitulatif_controller.rb Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-24 10:56:12 +02:00
registrations_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00
sessions_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00
siret_controller.rb move controller into users folder 2015-09-23 19:20:03 +02:00
unlocks_controller.rb [#884] add user 2015-09-23 10:02:01 +02:00