Merge branch 'master' into 5720-ajax-loading-error
authorRadhika Chippada <radhika@curoverse.com>
Tue, 12 May 2015 17:50:31 +0000 (13:50 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 12 May 2015 17:50:31 +0000 (13:50 -0400)
commitd14dd75b263d8f999603b66d23f74667d36a2412
tree5d93e4ec11bd34e6ba3bbaa99bf984d0b5e949af
parent17fb6bca5786bad5cff83a187e70adbca9c1d14a
parent2b43d35b7f1bc94d658203086cb5bd1e6415bc52
Merge branch 'master' into 5720-ajax-loading-error
apps/workbench/app/assets/javascripts/infinite_scroll.js