ariskotsomitopoulos 324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt		2022-05-17 11:55:07 +03:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements	2022-05-17 11:55:07 +03:00
.gitignore
build.gradle	Exclude some files from check	2022-05-16 12:23:10 +02:00
lint.xml	Small improvement on lint.xml file	2022-05-16 12:23:10 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00