SpiritCroc ca8d940c0e [merge] Fix some bubble layout ... Change-Id: I472d12d111de2352544c136a17288e54328a3c5d		2021-12-23 16:02:35 +01:00
..
androidTest/java/im/vector/app	extracting the emoji processing to an interface so that we can override the behaviour in the unit test	2021-12-17 10:38:49 +00:00
debug	Merge tag 'v1.3.12' into sc	2021-12-23 14:36:13 +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] Fix some bubble layout	2021-12-23 16:02:35 +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	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