Benoit Marty 1cb91ca5df Use color parser		2021-12-31 15:13:01 +01:00
..
assets	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
java/im/vector/app	Use color parser	2021-12-31 15:13:01 +01:00
res	Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data	2021-12-31 13:02:24 +01:00
AndroidManifest.xml	Merge pull request #4656 from vector-im/feature/adm/dynamic-login-flow	2021-12-30 10:29:52 +01:00