ericdecanini 5a819bbafa Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt		2022-03-21 19:40:14 +01:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player	2022-03-21 19:40:14 +01:00
.gitignore
build.gradle	Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions	2022-03-18 12:06:30 +01:00
lint.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00