Merge branch 'master' into MM-50966-in-product-expansion-backend

Этот коммит содержится в:
Conor Macpherson
2023-04-18 12:07:48 -04:00
родитель 98aa1f070b 067e36c23c
Коммит adb4ef04c1
1604 изменённых файлов: 4615 добавлений и 4153 удалений

Просмотреть файл

@@ -15,10 +15,10 @@ import (
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/server/channels/utils"
"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
"github.com/mattermost/mattermost-server/server/v8/channels/utils"
"github.com/mattermost/mattermost-server/server/v8/model"
"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
)
// APIs for self-hosted workspaces to communicate with the backing customer & payments system.