Merge branch 'master' into 2640-folder-api
[arvados.git] / apps / workbench / app / controllers / traits_controller.rb
1 class TraitsController < ApplicationController
2 end