Merge remote-tracking branch 'origin/master' into 2044-share-button
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 22 May 2014 20:30:34 +0000 (16:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 22 May 2014 20:30:34 +0000 (16:30 -0400)
commit675794872a5d064cf0a8177d662555c04b0dae51
tree5f7276a626deebf9d1910ef84aaf52e1b1268d9f
parent06a0c1d9f2e6cf1d5a9fd00b53071d857252f9fa
parentd5823126a51b7c31915e01fee100abe9468014e5
Merge remote-tracking branch 'origin/master' into 2044-share-button
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/views/collections/_sharing_button.html.erb
apps/workbench/app/views/collections/_sharing_popup.html.erb
apps/workbench/app/views/collections/_show_files.html.erb
apps/workbench/app/views/collections/show.html.erb
apps/workbench/config/routes.rb
services/api/app/models/arvados_model.rb