ericdecanini 1ffa02c287 Merge remote-tracking branch 'origin/feature/eric/new_fab' into feature/eric/space-list-modal ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt		2022-08-05 17:11:57 +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/feature/eric/new_fab' into feature/eric/space-list-modal	2022-08-05 17:11:57 +02:00
res	Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab	2022-08-05 17:11:00 +02:00
AndroidManifest.xml	Align naming of components for the live location feature	2022-08-02 09:09:19 +02:00