Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Fri, 6 Jun 2014 19:57:19 +0000 (15:57 -0400)
committerradhika <radhika@curoverse.com>
Fri, 6 Jun 2014 19:57:19 +0000 (15:57 -0400)
commit620a10bed55b85294baad9dba965ea8dad59e884
tree376983e5e20df76393b6369ef5e1eb5b60b4d9a4
parentf3b4b263d8c656e15993ea71146747e8cf102bf9
parent6a8463eea9e32cb5cffcaf2f04667520794404ec
Merge branch 'master' into 2871-preload-objects
apps/workbench/app/controllers/application_controller.rb