ericdecanini 8b0fba2ef5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt		2022-08-16 11:58:25 +02: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/space-list-modal	2022-08-16 11:58:25 +02:00
res	Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal	2022-08-16 11:58:25 +02:00
AndroidManifest.xml	moving debug menu access to only the debug sourceset and providing an injectable interface to decouple from the direct access	2022-08-08 17:02:08 +01:00