gem
|
830ebf6b93
|
Merge commit '0a175bb8b1eb8d4a40c66107ca77a2ff33212bf9' into pre_merge
# Conflicts:
# .idea/libraries/Dart_SDK.xml
# android/build.gradle
# android/gradle/wrapper/gradle-wrapper.properties
# android/src/main/AndroidManifest.xml
# example/android/app/build.gradle
# example/android/build.gradle
# example/android/settings.gradle
# example/lib/main.dart
# example/pubspec.lock
# ios/flutter_openim_sdk.podspec
# lib/src/manager/im_conversation_manager.dart
# lib/src/manager/im_friendship_manager.dart
# lib/src/models/notification_info.dart
|
2025-12-10 18:13:02 +08:00 |
|
