Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 17:23:12 +0000 (13:23 -0400)
committerradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 17:23:12 +0000 (13:23 -0400)
commit1650c9eec24fea204cdbf5229ed61d564b48cdb9
treefae90c43a620e60098b9c76769b14f554edb96c9
parentf526141fa776df068d011093ccb89f31f52e69be
parentabf6347cc1d56bc448e993249c9d6359ba60c606
Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/work_unit.rb