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

..

docs

Package have been renamed, so also rename it here.

2022-05-20 21:14:42 +02: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

Bump gradle from 7.2.2 to 7.3.1 (#7364)

2022-10-17 09:14:28 +02:00

proguard-rules.pro

…