ericdecanini 7d29fbc68c Fixes post merge errors		2022-07-18 15:06:25 +02:00
..
assets	Replace ffmpeg-kit with libopus and libopusenc.	2022-06-15 11:34:23 +02:00
java/im/vector/app	Fixes post merge errors	2022-07-18 15:06:25 +02:00
res	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:05:04 +02:00
AndroidManifest.xml	font scale setting screen (#6453)	2022-07-18 09:49:57 +02:00