Adam Brown f24c962a4a Merge pull request #4668 from vector-im/feature/adm/i-already-have-an-account ... FTUE Auth - I already have an account		2022-01-06 17:11:44 +00:00
..
androidTest/java/im/vector/app	Rename some string resources	2022-01-04 14:25:36 +01:00
debug	renaming parameters and properties to avoid clashing with kotlin/java8 keywords	2022-01-06 14:17:23 +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 #4668 from vector-im/feature/adm/i-already-have-an-account	2022-01-06 17:11:44 +00: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	lifting the seenIds cache to the event queue rather than chaining it through, allows us to simplify the state model	2021-11-18 13:39:07 +00:00