Peter
|
112d1ed974
|
Merge commit '879f684d06d4440b0cfcfa38b2b699577247d044' into voiceover
# Conflicts:
# TelegramUI.xcodeproj/project.pbxproj
# TelegramUI/ChatController.swift
# TelegramUI/ChatControllerNode.swift
# TelegramUI/ChatMessageInteractiveMediaNode.swift
# TelegramUI/OpenResolvedUrl.swift
# TelegramUI/PeerMediaCollectionControllerNode.swift
# TelegramUI/PresentationData.swift
# TelegramUI/PresentationStrings.swift
# TelegramUI/PresentationThemeSettings.swift
# TelegramUI/Resources/PresentationStrings.mapping
# TelegramUI/SettingsThemeWallpaperNode.swift
# TelegramUI/TelegramApplicationContext.swift
# TelegramUI/TelegramInitializeLegacyComponents.swift
# TelegramUI/TelegramRootController.swift
# TelegramUI/ThemeColorsGridController.swift
# TelegramUI/ThemeGridController.swift
# TelegramUI/ThemeGridControllerItem.swift
# TelegramUI/ThemeGridControllerNode.swift
# TelegramUI/ThemeGridSearchContentNode.swift
# TelegramUI/ThemeSettingsChatPreviewItem.swift
# TelegramUI/ThemeSettingsController.swift
# TelegramUI/WallpaperGalleryController.swift
# TelegramUI/WallpaperGalleryItem.swift
# TelegramUI/WallpaperListPreviewController.swift
# TelegramUI/WallpaperListPreviewControllerNode.swift
|
2019-02-01 21:30:14 +04:00 |
|
