merge with master

2016-09-28 13:02:15 +02:00
parent 248ed2672f 10e63e5dd2
commit 5ccdbf01fd
164 changed files with 7241 additions and 1917 deletions
@@ -12,8 +12,8 @@ type OAuthInfo struct {

 type OAuther struct {
 	GitHub, Google, Twitter, Generic, GrafanaNet bool
-	OAuthInfos                       map[string]*OAuthInfo
-	OAuthProviderName                string
+	OAuthInfos                                   map[string]*OAuthInfo
+	OAuthProviderName                            string
 }

 var OAuthService *OAuther