Merge branch 'master' into 4036-combine-collections-in-project-issue
[arvados.git] / apps / workbench / app / controllers / traits_controller.rb
1 class TraitsController < ApplicationController
2 end