ericdecanini f94aad65dd Merge branch 'feature/eric/new_fab' into feature/eric/space-list-modal ... # Conflicts: # vector/src/main/res/layout/fragment_room_list.xml		2022-08-09 14:31:39 +02:00
..
assets	Replace ffmpeg-kit with libopus and libopusenc.	2022-06-15 11:34:23 +02:00
java/im/vector/app	Fixes toMvRxBundle import	2022-08-09 14:23:56 +02:00
res	Merge branch 'feature/eric/new_fab' into feature/eric/space-list-modal	2022-08-09 14:31:39 +02:00
AndroidManifest.xml	Align naming of components for the live location feature	2022-08-02 09:09:19 +02:00