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
..
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-24 14:40:28 +01:00
.gitignore
build.gradle	Update versions to 1.4.8	2022-03-23 16:27:36 +01:00
proguard-rules.pro