Ali
|
461c278867
|
Fix linking
|
2020-02-27 00:02:03 +04:00 |
|
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 |
|
Ali
|
97caa448c2
|
Temp
|
2020-02-03 17:31:09 +04:00 |
|
Ali
|
ca0668df3d
|
Temp
|
2019-11-14 01:14:35 +04:00 |
|
Ali
|
a460da4770
|
Temp
|
2019-11-09 23:14:22 +04:00 |
|
Peter
|
9bc996374f
|
Add 'submodules/AsyncDisplayKit/' from commit '02bedc12816e251ad71777f9d2578329b6d2bef6'
git-subtree-dir: submodules/AsyncDisplayKit
git-subtree-mainline: d06f423e0ed3df1fed9bd10d79ee312a9179b632
git-subtree-split: 02bedc12816e251ad71777f9d2578329b6d2bef6
|
2019-06-11 18:42:43 +01:00 |
|