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
..
debug	moving the debug icon to the main source set	2022-01-06 10:03:13 +00:00
main	Merge branch 'develop' into feature/aris/threads	2022-01-18 12:41:40 +02:00
release/res/values	Move test style Activity and layout to the new ui-style module	2021-06-15 18:17:36 +02:00