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
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org	Merge branch 'develop' into feature/aris/threads	2022-01-18 12:41:40 +02:00
res	Import sas strings	2021-06-18 10:25:37 +02:00
AndroidManifest.xml	Fix warning	2021-09-02 09:43:39 +02:00