ericdecanini 67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent		2022-07-18 15:03:42 +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 task/eric/replace_flatten_with_direct_parent	2022-07-18 15:03:42 +02:00
res	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:03:42 +02:00
AndroidManifest.xml	Rename Android Service to use AndroidService suffix to limit confusion with our Matrix SDK Services	2022-07-04 21:39:01 +02:00