Tanguy PATTE d6e4a76bf9 Merge branch 'develop' into refactor_type_de_xxx ... Conflicts: db/schema.rb		2015-11-20 17:16:45 +01:00
..
images	logo tps	2015-11-20 16:43:24 +01:00
javascripts	Merge branch 'develop' into refactor_type_de_xxx	2015-11-20 17:16:45 +01:00
stylesheets	Merge branch 'develop' into refactor_type_de_xxx	2015-11-20 17:16:45 +01:00