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
..
java/org/matrix/android/sdk	Merge branch 'develop' into feature/aris/threads	2022-01-18 12:41:40 +02:00
AndroidManifest.xml	Handle change from WorkManager 2.6.0.	2021-09-30 12:06:57 +02:00