ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Aaron Schubert
2016-04-19 09:02:07 +01:00
parent 3b6ed98e5f 33e36de5dc
commit 21abe8f899
401 changed files with 18358 additions and 4200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AsyncDisplayKit/ASButtonNode.h
View File

@@ -28,19 +28,17 @@
@property (nonatomic, assign) BOOL laysOutHorizontally;
/** Horizontally align content (text or image).
Defaults to ASAlignmentMiddle.
Defaults to ASHorizontalAlignmentMiddle.
*/
@property (nonatomic, assign) ASHorizontalAlignment contentHorizontalAlignment;
/** Vertically align content (text or image).
Defaults to ASAlignmentCenter.
Defaults to ASVerticalAlignmentCenter.
*/
@property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment;
/**
* @discussion insets the title and the image node
*
* @param contentEdgeInsets The insets used around the title and image node
* @discussion The insets used around the title and image node
*/
@property (nonatomic, assign) UIEdgeInsets contentEdgeInsets;