Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Tue, 3 Jun 2014 15:27:41 +0000 (11:27 -0400)
committerradhika <radhika@curoverse.com>
Tue, 3 Jun 2014 15:27:41 +0000 (11:27 -0400)
commit2f1baf225599d7ae5dec4611696774e6a7100d58
tree953e680d10aa23b623b442efb9775d887e92a66a
parentf10a7f68c6ef25cf4ba87045201b17093a11249e
parentab2550bca241736c162a435d62fc3ccb4ac5dc8e
Merge branch 'master' into 2871-preload-objects
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/helpers/application_helper.rb