Commit e83c00b
committed
Merge branch 'develop' into PBE-5254-Convert-enums-in-generated-DTOs-from-the-OpenAPI-spec-to-custom-structs
# Conflicts:
# Assets/Plugins/StreamChat/Core/InternalDTO/Events/AnyEventInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Events/EventInternalDTO.cs.meta
# Assets/Plugins/StreamChat/Core/InternalDTO/Events/FlagUpdatedEventInternalDTO.cs.meta
# Assets/Plugins/StreamChat/Core/InternalDTO/Events/MessageUndeletedEventInternalDTO.cs.meta
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/APIErrorCode.cs.meta
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/AutomodBehaviourType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/AutomodType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/BlockListOptionsInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageCropType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageResizeType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/MessageType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Models/PushProviderType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/ConnectRequestQueryInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreateCallRequestType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreateDeviceRequestInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreatePollRequestInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/MessageRequestType.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/TranslateMessageRequestLanguage.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Requests/UpdatePollRequestInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseInternalDTO.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseRole.cs
# Assets/Plugins/StreamChat/Core/InternalDTO/Responses/MessageResponseInternalDTO.cs
# Assets/Plugins/StreamChat/Core/LowLevelClient/Models/Message.cs
# Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs
# Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs
# Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs
# Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs
# Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs1 file changed
Lines changed: 0 additions & 3 deletions
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | 23 | | |
27 | 24 | | |
28 | 25 | | |
| |||
0 commit comments