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)
commitd519091d2d64a859d0b786df7adadeeb1d4ae958
treee8b3356a134937144889723bb88b141f2d706574
parent1650c9eec24fea204cdbf5229ed61d564b48cdb9
parentd10c79192b333191796d949841ec792e61a6006c
Merge branch 'master' into 9318-dashboard-uses-work-units
apps/workbench/app/models/proxy_work_unit.rb
apps/workbench/app/models/work_unit.rb