Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
This commit is contained in:
wangchuxiao 2023-02-28 15:48:42 +08:00
parent ab6fa41438
commit c2cfb32c45

View File

@ -10,5 +10,5 @@ all_proto=(
msggateway/msg_gateway.proto
sdkws/ws.proto
conversation/conversation.proto
file/file.proto
third/third.proto
)