mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-09-06 12:43:58 +00:00
15 lines
542 B
Plaintext
15 lines
542 B
Plaintext
tree c624654e0ee50d67e81be5ed2b3666136c984c26
|
|
parent 4decd7321713f94428fd7cf604816c67c19a3bd1
|
|
parent 771c068ad67a2ecde7f0da2bf727e0326d156c54
|
|
author Peter Iakovlev <iakovlev.peter.p@gmail.com> 1542364909 +0400
|
|
committer Peter Iakovlev <iakovlev.peter.p@gmail.com> 1542364909 +0400
|
|
|
|
Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54'
|
|
|
|
# Conflicts:
|
|
# Source/ASVideoPlayerNode.h
|
|
# Source/Details/ASElementMap.mm
|
|
# Source/Details/_ASCollectionReusableView.mm
|
|
# Source/Details/_ASCollectionViewCell.mm
|
|
# Source/Private/ASMutableElementMap.mm
|