Merge branch 'develop' into v4

packages/stream_chat_flutter/CHANGELOG.md

@@ -22,6 +22,10 @@
 - Added OpenGraph preview support for links in `StreamMessageInput`.
 - Removed video compression.
 
+## 3.6.1
+
+- Updated `stream_chat_flutter_core` dependency to [`3.6.1`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
+
 ## 3.6.0
 
 🐞 Fixed
@@ -59,6 +63,7 @@
 - Fix default `Channel` route not opening from `ChannelListView` when `ChannelAvatar` is tapped
 
 ## 3.4.0
+
 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
 
 🐞 Fixed

packages/stream_chat_flutter/pubspec.yaml

@@ -36,7 +36,11 @@ dependencies:
   rxdart: ^0.27.0
   share_plus: ^4.0.1
   shimmer: ^2.0.0
+<<<<<<< HEAD
   stream_chat_flutter_core: ^4.0.0-beta.0
+=======
+  stream_chat_flutter_core: ^3.6.1
+>>>>>>> develop
   substring_highlight: ^1.0.26
   url_launcher: ^6.0.3
   video_player: ^2.1.0