Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 9 Jun 2014 13:09:20 +0000 (09:09 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 9 Jun 2014 13:09:20 +0000 (09:09 -0400)
commit879e1f31b0165c6abaa35a023ff66400757bb44b
tree0ee1064d314e3e43dbd0b300f69a8e4e5adf751d
parent987b88a5441387ff91877464def7933064815b59
parentf0d8ab52b77f74e9294fe634207ce6e1ff9748a1
Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/jobs_controller.rb