SpiritCroc dadeadcad4 Merge tag 'v1.5.18' into sc ... Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3		2023-01-02 17:57:49 +01:00
..
androidTest	Fix unit test.	2022-11-18 14:46:03 +03:00
debug/res/drawable	Merge tag 'v1.5.0' into merge-v1.5.0	2022-09-23 16:28:00 +02:00
main	Merge tag 'v1.5.18' into sc	2023-01-02 17:57:49 +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	Merge pull request #7843 from vector-im/bugfix/nfe/sync_filter_fix	2022-12-28 11:04:40 +01:00