Skip to content

Commit 1387678

Browse files
committed
Merge remote-tracking branch 'upstream/main' into temp-fetch-message
# Conflicts: # internal/conversation_msg/api.go # internal/conversation_msg/conversation_notification.go # internal/conversation_msg/message_check.go # internal/interaction/compressor.go # internal/interaction/long_conn_mgr.go # msgtest/config.go # msgtest/main/main.go # msgtest/module/manager.go # msgtest/module/msg_sender.go # msgtest/module/pressure.go # msgtest/module/user_manager.go # msgtest/pressure_test.go # pkg/db/chat_log_model.go # pkg/db/db_interface/databse.go # pkg/db/db_js.go # pkg/syncer/syncer.go # sdk_struct/sdk_struct.go # testv2/friend_test.go # wasm/indexdb/init.go
2 parents 1fc3e18 + 2b60136 commit 1387678

File tree

3 files changed

+2
-0
lines changed

3 files changed

+2
-0
lines changed

.DS_Store

6 KB
Binary file not shown.

pkg/db/version_sync.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323

2424
"gorm.io/gorm"
2525

26+
"gorm.io/gorm"
27+
2628
"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
2729
"github.com/openimsdk/tools/errs"
2830
)

wasm/cmd/openIM.wasm

27.2 MB
Binary file not shown.

0 commit comments

Comments
 (0)