From: Tom Clegg <tom@curoverse.com>
Date: Thu, 29 Oct 2015 20:31:37 +0000 (-0400)
Subject: 5824: Merge branch 'master' into 5824-keep-web
X-Git-Tag: 1.1.0~1274^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6e76e3322d66f609dabcd34c98cba34bd739e089

5824: Merge branch 'master' into 5824-keep-web
---

6e76e3322d66f609dabcd34c98cba34bd739e089
diff --cc doc/_config.yml
index 6d0bdb2f28,75cb997d78..2f37f5af08
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@@ -153,8 -153,8 +153,9 @@@ navbar
        - install/install-shell-server.html.textile.liquid
        - install/create-standard-objects.html.textile.liquid
        - install/install-keepstore.html.textile.liquid
+       - install/configure-azure-blob-storage.html.textile.liquid
        - install/install-keepproxy.html.textile.liquid
 +      #- install/install-keep-web.html.textile.liquid
        - install/install-crunch-dispatch.html.textile.liquid
        - install/install-compute-node.html.textile.liquid
      - Helpful hints: