Benoit Marty 3b0856bf8e Merge pull request #5249 from vector-im/feature/mna/2782-collapse-acl-events ... #2782: Collapse server ACLs update events		2022-02-18 10:54:46 +01:00
..
androidTest/java/im/vector/app	Merge pull request #5185 from vector-im/feature/adm/decouple-matrix-creation	2022-02-17 15:35:09 +01: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 #5249 from vector-im/feature/mna/2782-collapse-acl-events	2022-02-18 10:54:46 +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	creating and passing stored user properties on post hog initialisation	2022-02-15 16:03:21 +00:00