ericdecanini 7449d15d2f 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-22 14:15:29 +01:00
..
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-22 14:15:29 +01:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Use MatrixConfiguration & move presence sync enabled checks out of view	2022-03-17 14:50:15 +01:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00