SpiritCroc 4147b06d08 [merge] Fix build ... Change-Id: I05a3dbb9e136f30c429bcc67670bb9411f6476a7		2023-03-08 20:38:16 +01:00
..
androidTest	Extend workaround for extra new lines in timeline (#8187)	2023-03-06 16:03:53 +00:00
debug/res/drawable	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00
main	[merge] Fix build	2023-03-08 20:38:16 +01:00
release/res/drawable	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00
sharedTest/java/im/vector/app/test/shared
test	Be able to let the user trust several Fingerprints during login flow.	2023-03-01 21:18:46 +01:00