3235: Merge branch 'master' into 3235-top-nav-site-search
authorTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 21:12:52 +0000 (17:12 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 21:12:52 +0000 (17:12 -0400)
commitd13e8de76d48788a9198d4581205995f45464ff3
tree88d2fab0377f368b73a05169773601845bb20a95
parent0dca88749fcd5615bf687c916fca9157bf258998
parent29e5eb86b1dbbb644c244ec6e08e935c06e50d1c
3235: Merge branch 'master' into 3235-top-nav-site-search

Conflicts:
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/layouts/body.html.erb