Merge branch 'develop' into steve/5553_bubbles_text_link

# Conflicts:
#	Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.h
This commit is contained in:
SBiOSoftWhare
2022-02-18 15:16:59 +01:00
61 changed files with 1235 additions and 405 deletions
@@ -364,4 +364,7 @@ extern NSString *const kMXKRoomBubbleCellUrlItemInteraction;
/// Called when a UI component is long pressed
- (IBAction)onLongPressGesture:(UILongPressGestureRecognizer*)longPressGestureRecognizer;
/// Remove marker view if present
- (void)removeReadMarkerView;
@end