SBiOSoftWhare 057aded551 Merge branch 'develop' into steve/5553_bubbles_text_link ...

# Conflicts:
#	Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.h

2022-02-18 15:16:59 +01:00

..

BaseRoomCell

Merge branch 'develop' into steve/5553_bubbles_text_link

2022-02-18 15:16:59 +01:00

Call

Fix several MARK comments.

2022-02-16 12:09:55 +01:00

Common

Merge branch 'develop' into steve/5553_bubbles_text_link

2022-02-18 15:16:59 +01:00

EmptyContent

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

Encryption

Merge branch 'develop' into steve/bubbles_move_files

2022-02-16 16:07:32 +01:00

KeyVerification

Fix several MARK comments.

2022-02-16 12:09:55 +01:00

MessageTyping

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

RoomCreation

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

RoomCreationIntro

BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView (2).

2022-02-16 10:40:56 +01:00

RoomMembership

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

RoomPredecessor

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

SizableCell

SizableBaseRoomCell: Handle read marker view.

2022-02-17 19:22:00 +01:00

Styles

Merge branch 'develop' into steve/5553_bubbles_text_link

2022-02-18 15:16:59 +01:00

RoomTimelineCellIdentifier.h

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00

RoomTimelineConfiguration.swift

Room timeline: Move files in explicit folders.

2022-02-16 09:36:52 +01:00