3235: Merge branch 'master' into 3235-top-nav-site-search
authorTom Clegg <tom@curoverse.com>
Fri, 1 Aug 2014 00:25:43 +0000 (20:25 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 1 Aug 2014 00:25:43 +0000 (20:25 -0400)
commitc7bf82b621dae10a68a74b95439fa8f4ae3c502f
tree6fe3e5055d033097bb00de5459fba258d13d1d07
parent98721242a9eff3f0f21a75aaac0ce3abeb7c3391
parentda7d1fa4d078d0d7785672a195b16a9134478b0d
3235: Merge branch 'master' into 3235-top-nav-site-search
apps/workbench/app/views/application/_choose.js.erb
apps/workbench/app/views/layouts/body.html.erb