ariskotsomitopoulos 9d48ecea2f Merge branch 'develop' into feature/aris/threads ... # Conflicts: # .github/workflows/integration.yml # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt		2022-01-12 18:20:50 +02:00
..
androidTest/java/im/vector/app	Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement	2022-01-12 17:11:16 +01:00
debug	adding back debug option to enable carousel (was rebased away)	2022-01-07 13:47:20 +00:00
fdroid
gplay
main	Merge branch 'develop' into feature/aris/threads	2022-01-12 18:20:50 +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