Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 00:49:46 +0000 (20:49 -0400)
committerradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 00:49:46 +0000 (20:49 -0400)
commite02bf11203b85a6baac31584b9ba451c92be21b3
tree06e8ccb674752378890033d2ebd41099945f840b
parent10e7635b3627c7a70f9ed4bc5adee92854a3a274
parentc2a1512988551e03ce4270f9e936edde37f6c1b8
Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units

Conflicts:
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/work_unit.rb