Merge branch 'master' into 1971-show-image-thumbnails
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 15 Apr 2014 14:02:02 +0000 (10:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 15 Apr 2014 14:02:02 +0000 (10:02 -0400)
commit7a98271d94163cdc4afa5bfcf275db353bc062d2
tree852083b6b7973a3e7f10746fdef4de042b842b27
parent6d59f29ba37c608e4b01b27a2fa78bc065fdc2a6
parentbb45025e80abc00f8da524d9a78c0bab976d4f3a
Merge branch 'master' into 1971-show-image-thumbnails

Conflicts:
apps/workbench/app/views/collections/_show_files.html.erb
apps/workbench/app/views/collections/_show_files.html.erb