Tanguy PATTE ca363ca095 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop ... Conflicts: db/schema.rb		2015-09-23 10:02:54 +02:00
..
assets	[#884] add user	2015-09-23 10:02:01 +02:00
controllers	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-23 10:02:54 +02:00
decorators	[#878] add liste of dossier in backoffice	2015-09-22 11:56:14 +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-23 10:02:54 +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	[#884] add user	2015-09-23 10:02:01 +02:00