Merge branch 'master' into 7490-datamanager-dont-die-return-error
[arvados.git] / apps / workbench / app / controllers / traits_controller.rb
1 class TraitsController < ApplicationController
2 end