Merge branch '2376-show-collection-tags-everywhere' into 1971-show-image-thumbnails
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 15 Apr 2014 14:04:54 +0000 (10:04 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 15 Apr 2014 14:04:54 +0000 (10:04 -0400)
commit1b7d5cef1b7890994826a44102b589124a2a2340
tree6ee602f438afae678264bab19fa76f39c6130509
parent7a98271d94163cdc4afa5bfcf275db353bc062d2
parentd66cd99b144e949dc7128e7299689ca567a761c8
Merge branch '2376-show-collection-tags-everywhere' into 1971-show-image-thumbnails

Conflicts:
apps/workbench/app/controllers/actions_controller.rb
apps/workbench/app/views/collections/_show_files.html.erb
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/views/collections/_show_files.html.erb