ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-11 15:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
733 Commits 2 Branches 281 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
rcancro
9bf62d14ab Merge remote-tracking branch 'upstream/master' into baseline 
# Conflicts:
#	AsyncDisplayKit/Layout/ASLayoutSpec.h
#	AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
 2015-08-24 09:54:36 -07:00
rcancro
e991242513 removed "Stack" from baseline related layout names 2015-08-22 19:03:55 -07:00