Benoit Marty 357d7ee338 Merge pull request #4115 from vector-im/feature/adm/login-key-verification-flow ... Skipping passphrase screen when no passphrase is available		2021-09-29 15:04:58 +02:00
..
assets	New voip design: clean after benoit review	2021-08-26 11:08:34 +02:00
java/im/vector/app	when the keyinfo doesn't contain a passphrase we shouldn't view the passphrase screen	2021-09-29 13:11:19 +01:00
res	Merge branch 'origin/develop' into Weblate.	2021-09-29 10:05:06 +00:00
AndroidManifest.xml	Cherry pick room on leave space	2021-09-16 09:20:25 +02:00