Benoit Marty 5b2478a34f Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings ... Feature/dla/keyword notification settings		2021-08-27 18:19:17 +02:00
..
assets	New voip design: clean after benoit review	2021-08-26 11:08:34 +02:00
java/im/vector/app	Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings	2021-08-27 18:19:17 +02:00
res	Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings	2021-08-27 18:19:17 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/fga/new_voip_design	2021-08-11 12:37:54 +02:00