ericdecanini edfe81cc2b 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-24 14:40:28 +01:00
..
assets	Remove 3rd party waveform library.	2022-03-02 17:46:09 +03:00
java/im/vector/app	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-24 14:40:28 +01:00
res	Merge branch 'develop' into feature/ons/voice_message_scrubbing	2022-03-23 13:32:36 +03:00
AndroidManifest.xml	Check permission for background location (OS version <= Android 10 case)	2022-03-15 17:50:58 +01:00