ariskotsomitopoulos 8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt		2022-03-15 14:21:04 +01:00
..
src	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-15 14:21:04 +01:00
.gitignore
build.gradle	Using flow to show items counter	2022-03-14 11:15:17 +01:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00