Eric Decanini 38ba61f144 Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication ... Fixes room not being in space after upgrade		2022-07-20 12:30:42 +02:00
..
assets	Replace ffmpeg-kit with libopus and libopusenc.	2022-06-15 11:34:23 +02:00
java/im/vector/app	Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication	2022-07-20 12:30:42 +02:00
res	Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events	2022-07-19 16:39:45 +02:00
AndroidManifest.xml	font scale setting screen (#6453)	2022-07-18 09:49:57 +02:00