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