ericdecanini edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt		2022-03-24 14:40:28 +01:00
..
.gitignore
5426.feature	Changelog added.	2022-03-04 17:21:00 +03:00
5473.bugfix	Reverts to fix by removing event timestamp condition	2022-03-10 19:16:22 +01:00
5517.misc	adding changelog entry	2022-03-23 17:29:06 +00:00