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

2016-11-08 09:31:19 +01:00
parent 901e670db4 a7be3b91fd
commit 49af12f69f
14 changed files with 204 additions and 62 deletions
@@ -339,7 +339,7 @@ your Grafana instance. For example
    scopes = user:email,read:org
    auth_url = https://github.com/login/oauth/authorize
    token_url = https://github.com/login/oauth/access_token
-    allow_sign_up = false
+    allow_sign_up = true
    # space-delimited organization names
    allowed_organizations = github google