SpiritCroc dd9bbeef1b Fix disabled global custom emote room packs still being shown ... Change-Id: If97800ce3c47aac9aefaae81a3777877844320da		2023-01-16 16:31:08 +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	Fix disabled global custom emote room packs still being shown	2023-01-16 16:31:08 +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 #7724 from vector-im/feature/bma/launchWhenResumed	2023-01-06 18:43:53 +01:00