3114: Merge branch 'master' into 3114-copy-to-project
authorTom Clegg <tom@curoverse.com>
Mon, 18 Aug 2014 22:02:47 +0000 (18:02 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 18 Aug 2014 22:02:47 +0000 (18:02 -0400)
commitd81ea65da05119d5c6480d373b5d42bbee8ae1ad
treec3ab477cdbdabeedbb5f357887e0e229c2aa6c67
parentf7768d3dbc6e4c4fa56cbe4906d6682120b8daa3
parent8917fa82999bdf0020f623db9869abae99930b56
3114: Merge branch 'master' into 3114-copy-to-project
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/users_controller.rb
apps/workbench/app/views/collections/show.html.erb