Merge branch 'master' into 3504-clients-compatible-with-3036
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:05:33 +0000 (11:05 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:05:33 +0000 (11:05 -0400)
commit27697133a18371d692d69569659dd522e7b0fbdd
treeb1d11eb82cc09888c558785340e4684f00612539
parent289e5d15402d12ad02ac77e911aca7a32746c905
parent6b0ad588b44ee30cd400e85031b56dcb2a8ac567
Merge branch 'master' into 3504-clients-compatible-with-3036
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/views/collections/show.html.erb