3781: Merge branch 'master' into 3781-browser-upload
authorTom Clegg <tom@curoverse.com>
Thu, 4 Dec 2014 18:03:20 +0000 (13:03 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 4 Dec 2014 18:03:20 +0000 (13:03 -0500)
commitf59d6d76acf9c6f5bb95c5902b2c9a1cca427e93
tree1932c1232743bd9902dc0da494ffb20b1e5192fc
parent29b0dccdf90d3cf1e7472f0653cc9a38cbbadc26
parent1f48e58568dc961fd1e606c1d9bc250de8c010f7
3781: Merge branch 'master' into 3781-browser-upload

Conflicts:
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/views/projects/show.html.erb
apps/workbench/Gemfile
apps/workbench/Gemfile.lock
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/views/projects/_show_dashboard.html.erb
apps/workbench/app/views/projects/show.html.erb
apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
apps/workbench/app/views/users/_manage_ssh_keys.html.erb