diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
| commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
| tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /app/role.go | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
| download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/role.go')
| -rw-r--r-- | app/role.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/role.go b/app/role.go index c99d8365b..c9278e0bd 100644 --- a/app/role.go +++ b/app/role.go @@ -6,8 +6,9 @@ package app import ( "reflect" - "github.com/mattermost/mattermost-server/model" "net/http" + + "github.com/mattermost/mattermost-server/model" ) func (a *App) GetRole(id string) (*model.Role, *model.AppError) { |