SpiritCroc 45a5b8ca94 [merge] Further merge fixups ... Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812		2022-01-29 15:56:13 +01:00
..
androidTest/java/im/vector/app	Fix sanity test	2022-01-25 21:37:24 +01:00
debug	Merge tag 'v1.3.16' into sc	2022-01-29 12:18:19 +01:00
fdroid/java/im/vector/app	Fix "@JvmStatic used for @Provides function in an object class" Lint warning.	2021-11-19 15:29:11 +01:00
gplay	[merge-fixup] Delete TestFirebaseToken, we use unifiedpush	2021-11-20 09:41:33 +01:00
main	[merge] Further merge fixups	2022-01-29 15:56:13 +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