SpiritCroc 9269a4442c Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc ...

Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt

2022-10-28 18:16:15 +02:00

..

sampledata

Add required resources.

2022-05-27 15:25:59 +03:00

src

Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc

2022-10-28 18:16:15 +02:00

.gitignore

…

build.gradle

Merge tag 'v1.5.4' into merge-v1.5.4

2022-10-28 18:02:53 +02:00