mirror of
				https://github.com/openimsdk/open-im-server.git
				synced 2025-11-04 11:22:10 +08:00 
			
		
		
		
	# Conflicts: # internal/rpc/user/user.go # pkg/common/convert/user.go # pkg/common/storage/cache/redis/friend.go # pkg/common/storage/controller/friend.go # pkg/common/storage/database/friend.go # pkg/common/storage/database/mgo/friend.go # pkg/common/storage/database/mgo/mongo_test.go