3021: Merge branch 'master' into 3021-more-phantomjs
authorTom Clegg <tom@curoverse.com>
Wed, 7 Jan 2015 17:14:21 +0000 (12:14 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 7 Jan 2015 17:14:21 +0000 (12:14 -0500)
commit809a0b4cf662cad17274a03adfec09a04dacf689
tree325693f521da5995f6f7a9699dead3351c0cf396
parentdea28585b81280c259ec4620f89fde957d272ca4
parenta32c4f9997a0c8941b62668c5e59941985359c05
3021: Merge branch 'master' into 3021-more-phantomjs
apps/workbench/app/assets/javascripts/infinite_scroll.js
apps/workbench/test/integration/projects_test.rb
apps/workbench/test/integration_helper.rb