SpiritCroc c03c6867f7 Merge branch 'merge-v1.3.8' into sc ... Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38 Conflicts: vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt		2021-11-17 20:26:27 +01:00
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature
src	Merge branch 'merge-v1.3.8' into sc	2021-11-17 20:26:27 +01:00
.gitignore
build.gradle	Merge tag 'v1.3.8' into HEAD	2021-11-17 20:17:45 +01:00
lint.xml	Fix lint issue	2021-11-17 14:18:12 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00