ericdecanini f24d8c2ada 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-13 20:13:03 +01:00
..
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-13 20:13:03 +01:00
.gitignore
build.gradle	Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint	2022-03-11 17:05:13 +01:00
proguard-rules.pro