Hugh Nimmo-Smith bfe3daa37f Fix compile error from bad merge		2022-10-14 17:25:06 +01:00
..
androidTest	Try to fix flaky RoomMemberListControllerTest	2022-10-05 08:50:12 +02:00
main	Fix compile error from bad merge	2022-10-14 17:25:06 +01:00
sharedTest/java/im/vector/app/test/shared
test	Merge pull request #7293 from vector-im/feature/bma/android13	2022-10-13 13:52:52 +02:00