Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench-correct
[arvados.git] / apps / workbench / app / assets / javascripts / traits.js.coffee
2013-06-27 Tom Cleggadd trait resource