]> git.arvados.org - arvados.git/commit
Merge branch 'master' into 3193-manage-account
authorradhika <radhika@curoverse.com>
Sat, 26 Jul 2014 17:14:01 +0000 (13:14 -0400)
committerradhika <radhika@curoverse.com>
Sat, 26 Jul 2014 17:14:01 +0000 (13:14 -0400)
commit41d206a19a04a87e3bb54ed9a41bb7a1f9cf966f
tree187f90398a3ffe428f9de045615763912a00e611
parent2afb2391969061c5504e7224f38ab9e5d7bfd023
parent1a09083539cf6e56fe91a5b5c75c20f35319922b
Merge branch 'master' into 3193-manage-account

Conflicts:
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/views/layouts/body.html.erb