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:47:42 +08:00
parent 2edb3cfd8c
commit ab6fa41438
3 changed files with 15 additions and 11 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ all_proto=(
rtc/rtc.proto
msg/msg.proto
push/push.proto
relay/relay.proto
msggateway/msg_gateway.proto
sdkws/ws.proto
conversation/conversation.proto
file/file.proto