ericdecanini 82cde166db Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt		2022-03-24 20:32:28 +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-24 20:32:28 +01:00
.gitignore
build.gradle	Update versions to 1.4.8	2022-03-23 16:27:36 +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