ariskotsomitopoulos 636474b748 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt # vector/src/main/java/im/vector/app/features/command/Command.kt # vector/src/main/java/im/vector/app/features/command/CommandParser.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt		2022-01-18 12:41:40 +02:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/aris/threads	2022-01-18 12:41:40 +02:00
.gitignore
build.gradle	Merge branch 'develop' into feature/aris/threads	2022-01-18 12:41:40 +02:00
lint.xml	Fix lint issue (TypographyDashes)	2022-01-04 12:47:46 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00