SpiritCroc 4573a4235e Merge tag 'v1.6.10' into sc ...

Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt

2024-01-10 19:57:20 +01:00

..

src/main

Merge tag 'v1.6.10' into sc

2024-01-10 19:57:20 +01:00

.gitignore

Create module vector-config

2022-02-23 18:08:04 +01:00

build.gradle

Bump gradle from 7.2.2 to 7.3.1 (#7364)

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