IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-10 03:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source 
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
This commit is contained in:
Gordon
2021-12-23 17:39:31 +08:00
parent 743715fa73 27fd4f444b
commit b76aa03d3a
47 changed files with 3034 additions and 4193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/constant/constant.go
+1 -1
View File
@@ -10,7 +10,7 @@ const (
Application = 0
AgreeApplication = 1
//feiend related
//friend related
BlackListFlag = 1
ApplicationFriendFlag = 0
FriendFlag = 1