mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge branch 'beta'
# Conflicts: # submodules/SettingsUI/Sources/Reactions/ItemListReactionItem.swift # submodules/TelegramUI/Components/ForumCreateTopicScreen/Sources/ForumCreateTopicScreen.swift # submodules/WebSearchUI/Sources/WebSearchController.swift # submodules/WebUI/Sources/WebAppController.swift # versions.json
This commit is contained in:
commit
8948340d83
@ -51,8 +51,7 @@ public class ItemListReactionItem: ListViewItem, ItemListItem {
|
|||||||
|
|
||||||
node.contentSize = layout.contentSize
|
node.contentSize = layout.contentSize
|
||||||
node.insets = layout.insets
|
node.insets = layout.insets
|
||||||
|
|
||||||
|
|
||||||
completion(node, {
|
completion(node, {
|
||||||
return (nil, { _ in apply() })
|
return (nil, { _ in apply() })
|
||||||
})
|
})
|
||||||
|
@ -308,7 +308,6 @@ public final class WebSearchController: ViewController {
|
|||||||
self.updateSearchQuery(query)
|
self.updateSearchQuery(query)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
required public init(coder aDecoder: NSCoder) {
|
required public init(coder aDecoder: NSCoder) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user