Merge branch 'master' into 3761-pull-list-worker
[arvados.git] / services / api / app / controllers / arvados / v1 / traits_controller.rb
1 class Arvados::V1::TraitsController < ApplicationController
2 end