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

first commit

2018-10-03 17:58:12 +02:00

build.gradle

Merge tag 'v1.3.8' into HEAD

2021-11-17 20:17:45 +01:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

2021-01-05 18:56:24 +01:00