11167: Merge branch 'master' into 11167-wb-remove-arvget
authorLucas Di Pentima <lucas@curoverse.com>
Mon, 7 Aug 2017 21:55:59 +0000 (18:55 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Mon, 7 Aug 2017 21:57:11 +0000 (18:57 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@curoverse.com>

1  2 
apps/workbench/config/application.default.yml
services/keep-web/handler.go

Simple merge