SpiritCroc dffc0c1d65 Merge tag 'v1.3.2' into sc ... Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5 Conflicts: .gitignore matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/di/FragmentModule.kt vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml		2021-10-11 09:55:26 +02:00
..
src/main	Big annoying commit: execute command `./gradlew ktlintFormat` - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
.gitignore	Initial commit	2020-07-08 20:09:55 +02:00
build.gradle	Revert "Revert "Revert "Use Java 11 source code"""	2021-09-29 09:56:32 +02:00
consumer-rules.pro	Initial commit	2020-07-08 20:09:55 +02:00
proguard-rules.pro	Initial commit	2020-07-08 20:09:55 +02:00