759da1fd09
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146 Conflicts: library/ui-styles/src/main/res/values/colors.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt vector-config/src/main/res/values/config-settings.xml vector/src/main/java/im/vector/app/SpaceStateHandler.kt vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt vector/src/main/res/drawable/ic_voice_mic.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/view_voice_message_recorder.xml vector/src/main/res/xml/vector_settings_labs.xml |
||
|---|---|---|
| .. | ||
| java/im/vector/app/config | ||
| res/values | ||
| AndroidManifest.xml | ||