mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 06:35:51 +00:00
Merge commit '295bfcaab3a868c87880c978170ccb6ab87caaf8'
# Conflicts: # submodules/ChatListUI/Sources/ChatListControllerNode.swift # submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift # submodules/ContactListUI/Sources/InviteContactsControllerNode.swift # submodules/InstantPageUI/Sources/InstantPageControllerNode.swift # submodules/InviteLinksUI/Sources/InviteLinkViewController.swift # submodules/MediaPickerUI/Sources/MediaPickerSelectedListNode.swift # submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift # submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift # submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift # submodules/SettingsUI/Sources/Reactions/ReactionChatPreviewItem.swift # submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift # submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift # submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift # submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift # submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift # submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift # submodules/TelegramUI/Sources/ChatMessageItem.swift # submodules/TelegramUI/Sources/PollResultsController.swift
This commit is contained in:
@@ -36,6 +36,7 @@ import MultiAnimationRenderer
|
||||
import EmojiStatusSelectionComponent
|
||||
import EntityKeyboard
|
||||
import TelegramStringFormatting
|
||||
import ForumCreateTopicScreen
|
||||
import AnimationUI
|
||||
|
||||
private func fixListNodeScrolling(_ listNode: ListView, searchNode: NavigationBarSearchContentNode) -> Bool {
|
||||
|
||||
Reference in New Issue
Block a user