4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop
authorTom Clegg <tom@curoverse.com>
Wed, 5 Nov 2014 17:22:03 +0000 (12:22 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 5 Nov 2014 17:22:03 +0000 (12:22 -0500)
commite34d6859d936f0b82f981d44be415a46b1aa61e1
treeeec9e5a96f3cde912a39d1c1ae0a2e3295a27124
parentf662e62c925d89ad466ff2271919dd6dd2ccfa86
parentf91dff0f2f49a83047e31b1a56dbddd85be6926a
4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop
apps/workbench/app/controllers/application_controller.rb