Merge branch 'master' into 2752-arv-put-resume-wip
[arvados.git] / apps / workbench / app / models / trait.rb
2014-05-28 Brett SmithMerge branch 'master' into 2752-arv-put-resume-wip
2014-05-27 Tom Clegg2760: Merge branch '2760-not-all-objects-in-folders...
2014-05-27 Tom Clegg2760: Exclude system objects like VMs and repos from...
2013-06-27 Tom Cleggadd trait resource