ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881 ... # Conflicts: # vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt		2022-10-04 14:05:23 -04:00
..
assets	Replace ffmpeg-kit with libopus and libopusenc.	2022-06-15 11:34:23 +02:00
java/im/vector/app	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881	2022-10-04 14:05:23 -04:00
res	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881	2022-10-04 14:05:23 -04:00
AndroidManifest.xml	Fix compilation warning. The Jitsi library does not include these permissions anymore.	2022-09-29 09:44:46 +02:00