Merge branch 'master' into 5493-getting-started-modal
authorRadhika Chippada <radhika@curoverse.com>
Wed, 8 Apr 2015 14:37:01 +0000 (10:37 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 8 Apr 2015 14:37:01 +0000 (10:37 -0400)
commit8e4ed0edeadc4dfcc85666ef5c36619815dca8e2
tree4ee7f3fce3fbc642451cd2288622c62483d33ac8
parent50843fcf14d836e82af855fa6775d409054b708d
parente009f03d9f3a620f375cf187291bd12c2bf1d74c
Merge branch 'master' into 5493-getting-started-modal
apps/workbench/app/views/layouts/body.html.erb
apps/workbench/test/integration/application_layout_test.rb
services/api/test/fixtures/api_client_authorizations.yml
services/api/test/fixtures/users.yml
services/api/test/functional/arvados/v1/users_controller_test.rb