Merge branch 'master' of github.com:grafana/grafana

e67b1ebf · Torkel Ödegaard · 0c6b34e2 · 576deb37 · e67b1ebf
Commit e67b1ebf authored Feb 28, 2018 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

public/app/partials/login.html
+1 -1

No files found.
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -59,7 +59,7 @@
          Sign in with {{oauth.generic_oauth.name}}
        </a>
      </div>
-      <div class="login-signup-box">
+      <div class="login-signup-box" ng-show="!disableUserSignUp">
        <div class="login-signup-title p-r-1">
          New to Grafana?
        </div>