3149: Merge branch 'master' into 3149-server-side-search
authorTom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 15:00:16 +0000 (11:00 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 15:00:16 +0000 (11:00 -0400)
commitf12350f25275fbf4c6c8692122f5eacce89794ee
tree8c099f4e99056db7611344e74a906d3a3104a451
parent80f6898bdc0006b95a398d2a8fe0dc8e99c87fb0
parentd1d0fd3c4e60298ce3cf6a718820a8f49abf1ded
3149: Merge branch 'master' into 3149-server-side-search
apps/workbench/app/controllers/application_controller.rb