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 /einterfaces | |
| 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 'einterfaces')
| -rw-r--r-- | einterfaces/brand.go | 3 | ||||
| -rw-r--r-- | einterfaces/oauthproviders.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/einterfaces/brand.go b/einterfaces/brand.go index fc584a91c..11e7d4e42 100644 --- a/einterfaces/brand.go +++ b/einterfaces/brand.go @@ -4,8 +4,9 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" "mime/multipart" + + "github.com/mattermost/mattermost-server/model" ) type BrandInterface interface { diff --git a/einterfaces/oauthproviders.go b/einterfaces/oauthproviders.go index 7e24d2a70..ed54a204a 100644 --- a/einterfaces/oauthproviders.go +++ b/einterfaces/oauthproviders.go @@ -4,8 +4,9 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" "io" + + "github.com/mattermost/mattermost-server/model" ) type OauthProvider interface { |