Merge branch 'master' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 21:07:38 +0000 (17:07 -0400)
committerradhika <radhika@curoverse.com>
Tue, 7 Jun 2016 21:07:38 +0000 (17:07 -0400)
1  2 
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/work_unit.rb