Merge branch 'master' into 4926-browser-based-upload
[arvados.git] / apps / workbench / app / controllers / traits_controller.rb
1 class TraitsController < ApplicationController
2 end