Merge branch 'master' into 3618-column-ordering
authorPhil Hodgson <bitbucket@philhodgson.net>
Fri, 24 Oct 2014 12:06:45 +0000 (14:06 +0200)
committerPhil Hodgson <bitbucket@philhodgson.net>
Fri, 24 Oct 2014 12:06:45 +0000 (14:06 +0200)
commit66c13b6055a363cb08197b8c5d040ed9a511c8ca
treebf764e328dcbbebe954266162ed8d345ed8d9e41
parent4e624965e369180dfb971bf3a53ae2b4d726f271
parent587fcc936d7b5b0b8c16220a5932cf9441e02ab0
Merge branch 'master' into 3618-column-ordering
apps/workbench/app/assets/javascripts/infinite_scroll.js
apps/workbench/app/assets/stylesheets/application.css.scss