Ali
|
9948945f7b
|
Merge commit '8341247b5df17485928a325cd314c18ad1b9f6f1' into bazel
# Conflicts:
# .gitignore
# BUCK
# Makefile
# Telegram/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements
# submodules/AsyncDisplayKit/Source/ASDisplayNode.h
# submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h
# submodules/Display/Display/ListView.swift
# submodules/Display/Display/Navigation/NavigationController.swift
# submodules/Display/Display/NavigationBar.swift
# submodules/Display/Display/NavigationButtonNode.swift
# submodules/Display/Display/TabBarNode.swift
# submodules/Display/Display/ViewController.swift
# submodules/Display/Source/ContextContentContainerNode.swift
# submodules/Display/Source/ContextContentSourceNode.swift
# submodules/Display/Source/ContextControllerSourceNode.swift
# submodules/Display/Source/ContextGesture.swift
# submodules/TelegramUI/Sources/Resources/Animations/ChatListEmpty.tgs
# submodules/TelegramUI/Sources/Resources/Animations/ChatListFilterEmpty.tgs
# submodules/TelegramUI/TelegramUI/ChatController.swift
# submodules/TelegramUI/TelegramUI/FetchVideoMediaResource.swift
# submodules/ffmpeg/FFMpeg/FFMpegRemuxer.m
|
2020-02-26 20:35:26 +04:00 |
|
