Skip to content

Commit d7490c6

Browse files
khushal87khushal87
committed
chore: resolve conflicts from v6
2 parents d97f8ab + 7f3dcf4 commit d7490c6

File tree

146 files changed

+6053
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+6053
-159
lines changed

‎.styles/Vocab/Base/accept.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,10 @@ Async
5252
subscribable
5353
memoizing
5454
Boolean
55+
draggable
56+
sendMessage
57+
overridable
58+
loadMore
59+
pollAnswers
60+
enum
61+
SendMessage

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1111
[![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
13-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-447%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-451%20KB-blue)
1414

1515
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
1616

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/answer-list-navigation.png‎

126 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/attachment-picker-poll-button.png‎

962 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-answers-list.png‎

101 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-comments-creation-1.png‎

171 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-comments-creation-2.png‎

231 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-creation-1.png‎

170 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-creation-2.png‎

240 KB
Loading

‎docusaurus/docs/reactnative/assets/guides/custom-poll-flow/custom-poll-background.png‎

239 KB
Loading

0 commit comments

Comments
 (0)