Merge branch 'master' into develop

2017-08-14 10:30:36 +02:00
parent eb18bfea07 17cb3f6e6a
commit 1dab313ca3
169 changed files with 6289 additions and 4746 deletions
@@ -31,7 +31,7 @@ type AdminUpdateUserPasswordForm struct {
 }

 type AdminUpdateUserPermissionsForm struct {
-	IsGrafanaAdmin bool `json:"isGrafanaAdmin" binding:"Required"`
+	IsGrafanaAdmin bool `json:"isGrafanaAdmin"`
 }

 type AdminUserListItem struct {