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
..
assets	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
controllers	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
decorators	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00
mailers	First Commit	2015-08-10 11:05:06 +02:00
models	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
uploaders	- Correction des tests suite à la modification du schéma de la base de données.	2015-09-21 17:59:03 +02:00
views	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00