diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
| commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
| tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /einterfaces | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
| download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip | |
Merge branch '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 { |