Benoit Marty d0cb5f4212 Merge pull request #2248 from vector-im/feature/bca/detect_reset ... Fix / reset cross signing not well supported		2020-10-12 20:49:15 +02:00
..
assets	Fix Copyright mention	2020-10-08 15:11:01 +02:00
java/im/vector/app	Merge pull request #2248 from vector-im/feature/bca/detect_reset	2020-10-12 20:49:15 +02:00
res	Remove unused string labs_merge_e2e_in_timeline	2020-10-12 19:02:54 +02:00
AndroidManifest.xml	Merge pull request #2203 from vector-im/feature/bma/pusher_data	2020-10-12 14:51:15 +02:00