Merge branch '2049-run-job-from-workbench' into 1971-show-image-thumbnails
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Mar 2014 13:43:55 +0000 (08:43 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Mar 2014 13:43:55 +0000 (08:43 -0500)
commit0d4ddf36fb71ecf7cc981c67c07584a3a7fcac46
treeb2ab8c043d12551b8f85a98857f8c5516ce9703d
parent5f3de04d46dd4aeec45731b4e5c479c689eee7b6
parentac5a69c5c0aaf0786023caa4599a6c55d67310bc
Merge branch '2049-run-job-from-workbench' into 1971-show-image-thumbnails
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/views/collections/_show_files.html.erb