Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench-correct
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:41:42 +0000 (13:41 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:41:42 +0000 (13:41 -0500)
commitfc6c801e7448c34b3b916813a8792e32f22bb7a8
tree977f3ab6cc5fdf22c0e12f6dfaec7980cfbdc8fc
parent5ddf9df205f089634cc39b8398dfee5e36faac87
parentdc97d8812b5f793c50e15b60fae66464690b9b41
Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench-correct
apps/workbench/app/views/users/_tables.html.erb
services/api/script/crunch-dispatch.rb