Merge branch '3118-docker-fixes'
[arvados.git] / apps / workbench / app / helpers / traits_helper.rb
2013-06-27 Tom Cleggadd trait resource