Sylvain 68f9324725 Merge branch 'steps' into dev ... Conflicts: app/assets/javascripts/controllers/projects.coffee.erb db/schema.rb		2016-07-13 16:10:18 +02:00
..
images	updated echosciences logo	2016-05-16 13:39:16 +02:00
javascripts	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00
stylesheets	link to openAPI documentation in front interface	2016-06-27 17:23:05 +02:00
templates	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00