Benoit Marty c40fc52ef5 Merge pull request #4999 from vector-im/feature/bma/zero_vote ... Fix an error in string resource (#4997)		2022-01-20 10:38:33 +01:00
..
androidTest/java/im/vector/app	updating splash submit copy to use Create account when the I already have an account feature is enabled	2022-01-19 10:38:28 +00:00
debug	fixing line length	2022-01-12 13:51:53 +00:00
fdroid	Fix "@JvmStatic used for @Provides function in an object class" Lint warning.	2021-11-19 15:29:11 +01:00
gplay	Fix "@JvmStatic used for @Provides function in an object class" Lint warning.	2021-11-19 15:29:11 +01:00
main	Merge pull request #4999 from vector-im/feature/bma/zero_vote	2022-01-20 10:38:33 +01:00
release	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app	Add some unit test for the command parser.	2022-01-19 20:52:31 +01:00