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
..
org	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-15 15:48:17 +01:00