aaron/open-im-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,881 Commits 27 Branches 108 Tags
82c3f871f4ce53cf71f6477f9637daa415fdb9ee
Commit Graph

5 Commits

Author SHA1 Message Date
wangchuxiao
0c417d3471 pb 2023-02-28 15:53:38 +08:00
wangchuxiao
ab6fa41438 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
 2023-02-28 15:47:42 +08:00
wangchuxiao
f586ab1ac2 push 2023-02-23 19:15:30 +08:00
wangchuxiao
e1a27e6aea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 
 Conflicts:
	cmd/api/main.go
	go.mod
	internal/push/fcm/push.go
	internal/push/getui/push.go
	internal/push/logic/init.go
	internal/push/logic/push_to_client.go
	internal/push/push_rpc_server.go
	internal/rpc/conversation/conversaion.go
	pkg/common/db/controller/group.go
	pkg/proto/push/push.pb.go
 2023-02-22 19:52:53 +08:00
wangchuxiao
94d50a6c71 push 2023-02-22 19:51:14 +08:00