SchildiChat-android/vector/src
ariskotsomitopoulos 694b8de034 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
2022-01-03 11:08:22 +02: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 pull request #4656 from vector-im/feature/adm/dynamic-login-flow 2021-12-30 10:29:52 +01: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 branch 'develop' into feature/aris/threads 2022-01-03 11:08:22 +02: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