ericdecanini 9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt		2022-03-15 15:48:17 +01:00
..
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-15 15:48:17 +01:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
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