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
..
src	Merge branch 'develop' into feature/aris/threads	2022-01-12 18:20:50 +02:00
.gitignore
build.gradle	Merge branch 'develop' into feature/aris/threads	2022-01-12 18:20:50 +02:00
proguard-rules.pro