Merge branch 'master' into 2051-nondeterministic-jobs
[arvados.git] / apps / workbench / app / assets / javascripts / traits.js.coffee
2013-06-27 Tom Cleggadd trait resource