Merge branch 'master' into 2596-refactor-pipeline-create
authorTom Clegg <tom@curoverse.com>
Thu, 17 Apr 2014 00:38:28 +0000 (20:38 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 17 Apr 2014 00:38:28 +0000 (20:38 -0400)
commit2340ebeaf34778645e6071e8b077df50e5ae3df5
tree153e59ce7947405483404d56df65b0536d1992f7
parent1881da329b33f722e35bef267c616a784163e482
parent2f91702d89b7a64093465a1923b87acade6b9715
Merge branch 'master' into 2596-refactor-pipeline-create

Conflicts:
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/helpers/application_helper.rb
services/api/test/functional/arvados/v1/links_controller_test.rb