Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac

2016-02-10 23:12:41 -08:00
parent 0201b9769c e37817285a
commit c3fc340c09
220 changed files with 7045 additions and 33398 deletions
@@ -268,6 +268,7 @@ example:
    scopes = user:email
    auth_url = https://github.com/login/oauth/authorize
    token_url = https://github.com/login/oauth/access_token
+    api_url = https://api.github.com
    allow_sign_up = false
    team_ids =