Merge branch 'charlesmchen/settingsButtonGlitch' into release/2.30.2

pull/1/head
Matthew Chen 7 years ago
commit f78198c07b

@ -497,7 +497,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
// Settings button.
UIBarButtonItem *settingsButton;
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(10, 0)) {
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0)) {
const NSUInteger kAvatarSize = 28;
UIImage *_Nullable localProfileAvatarImage = [OWSProfileManager.sharedManager localProfileAvatarImage];
UIImage *avatarImage = (localProfileAvatarImage

Loading…
Cancel
Save