diff options
| author | George Goldberg <george@gberg.me> | 2018-05-31 10:25:31 +0100 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-05-31 10:25:31 +0100 |
| commit | 27e7841a734e9c3ed71f988a653f5865d2ef6f91 (patch) | |
| tree | 1ccc65246fb166c25a9923f4e05ad7d6223892d1 /cmd/mattermost/commands/server.go | |
| parent | e39f5f46f3f6cdcb7ab8aeef8c601047f5942f85 (diff) | |
| parent | 994ccf475f96bcad668269fe25b0d22e975bc222 (diff) | |
| download | chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.gz chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.bz2 chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.zip | |
Merge branch 'advanced-permissions-phase-2'
Diffstat (limited to 'cmd/mattermost/commands/server.go')
| -rw-r--r-- | cmd/mattermost/commands/server.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 20ebfade6..10b44ad83 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -96,6 +96,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform } a.DoAdvancedPermissionsMigration() + a.DoEmojisPermissionsMigration() a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) a.AddConfigListener(func(prevCfg, cfg *model.Config) { |