3235: Merge branch 'master' into 3235-top-nav-site-search
authorTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 19:45:23 +0000 (15:45 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 19:45:23 +0000 (15:45 -0400)
commit83561af02e156758b09ea771510ad4f9ee506b06
treee28122d9fef5dc843b3174aa6f44b0284d326166
parent9591cf965cc6d780a88e713e7ee3c0530397dcd7
parent08ab73ebc61834742594b0eb12c7d3fca4660360
3235: Merge branch 'master' into 3235-top-nav-site-search

Conflicts:
apps/workbench/app/assets/javascripts/infinite_scroll.js
apps/workbench/app/views/application/_choose.html.erb
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/assets/javascripts/infinite_scroll.js
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/application/_choose.html.erb
apps/workbench/app/views/layouts/application.html.erb