master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
0a20220ef1
schildichat-android/vector/src
History
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
..
androidTest Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 2023-05-24 10:14:22 +00:00
debug/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
main Merge tag 'v1.6.10' into sc 2024-01-10 19:57:20 +01:00
release/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
sharedTest/java/im/vector/app/test/shared
test Merge tag 'v1.6.10' into sc 2024-01-10 19:57:20 +01:00