demarches-normaliennes/app/views/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
..
confirmations [#884] add user 2015-09-23 10:02:01 +02:00
description move controller into users folder 2015-09-23 19:20:03 +02:00
dossiers move controller into users folder 2015-09-23 19:20:03 +02:00
mailer [#884] add user 2015-09-23 10:02:01 +02:00
passwords [#884] add user 2015-09-23 10:02:01 +02:00
recapitulatif Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-24 10:56:12 +02:00
registrations [#884] add user 2015-09-23 10:02:01 +02:00
sessions [#884] add user 2015-09-23 10:02:01 +02:00
shared [#884] add user 2015-09-23 10:02:01 +02:00
siret move controller into users folder 2015-09-23 19:20:03 +02:00
unlocks [#884] add user 2015-09-23 10:02:01 +02:00