Xavier J 7cd08ec3f9 Merge branch 'develop' into print_css_for_dossier_show ... # Conflicts: # app/views/dossiers/_messagerie.html.haml		2017-02-07 17:38:02 +01:00
..
environments	add mailcatcher config in dev	2017-01-31 17:22:03 +01:00
initializers	Merge branch 'develop' into print_css_for_dossier_show	2017-02-07 17:38:02 +01:00
locales	Change status libelle	2017-01-04 18:09:35 +01:00
application.rb	test 2	2016-02-12 13:57:25 +01:00
boot.rb	First Commit	2015-08-10 11:05:06 +02:00
cable.yml	Add staging for redis cable	2017-01-02 10:22:43 +01:00
database.yml	add parallels tests	2015-12-21 10:45:50 +01:00
deploy.rb	Fix deploy	2017-01-09 21:45:08 +01:00
environment.rb	First Commit	2015-08-10 11:05:06 +02:00
fog_credentials.test.yml	Adding button, method in controller, testing call	2016-10-25 17:39:53 +02:00
routes.rb	Add tool change dossier state	2017-01-10 17:29:38 +01:00
secrets.yml	First Commit	2015-08-10 11:05:06 +02:00
unicorn.rb	Bootstrap Action Cable and Unicorn	2016-12-22 21:49:31 +01:00