SchildiChat-android/library/ui-styles
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
..
src Merge branch 'merge-v1.3.8' into sc 2021-11-17 20:26:27 +01:00
.gitignore
build.gradle Revert "Revert "Revert "Use Java 11 source code""" 2021-09-29 09:56:32 +02:00