Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Tue, 10 Jun 2014 19:56:07 +0000 (15:56 -0400)
committerradhika <radhika@curoverse.com>
Tue, 10 Jun 2014 19:56:07 +0000 (15:56 -0400)
commiteaa312ea7c35e35c64dbef9624be1d9c7df034ef
treef9f12229192e0398ce025255f5ba6c3c9a3f8473
parent3692a4ac4d8f76d2e704af5e504652650b4a00cc
parent70148c4918a95ee9a49a18bf5789801d02e8ef5e
Merge branch 'master' into 2871-preload-objects
apps/workbench/app/controllers/application_controller.rb