Merge branch 'master' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Wed, 8 Jun 2016 03:26:46 +0000 (23:26 -0400)
committerradhika <radhika@curoverse.com>
Wed, 8 Jun 2016 03:26:46 +0000 (23:26 -0400)
commit5390a3481986934e240bc4d663ab2010992950e2
treed9c77c1f0fd9fdfb2dff1630227ffc07d72968d6
parentd519091d2d64a859d0b786df7adadeeb1d4ae958
parent8630c5472c508b37c26751768c568e429652bb15
Merge branch 'master' into 9318-dashboard-uses-work-units
apps/workbench/app/models/proxy_work_unit.rb