bc1f3cb24d
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5 Conflicts: library/ui-strings/src/main/res/values-bg/strings_sc.xml library/ui-strings/src/main/res/values-cs/strings_sc.xml library/ui-strings/src/main/res/values-de/strings_sc.xml library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml library/ui-strings/src/main/res/values-es/strings_sc.xml library/ui-strings/src/main/res/values-et/strings_sc.xml library/ui-strings/src/main/res/values-eu/strings_sc.xml library/ui-strings/src/main/res/values-fa/strings_sc.xml library/ui-strings/src/main/res/values-fr/strings_sc.xml library/ui-strings/src/main/res/values-hu/strings_sc.xml library/ui-strings/src/main/res/values-it/strings_sc.xml library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml library/ui-strings/src/main/res/values-nl/strings_sc.xml library/ui-strings/src/main/res/values-pl/strings_sc.xml library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml library/ui-strings/src/main/res/values-ro/strings_sc.xml library/ui-strings/src/main/res/values-ru/strings_sc.xml library/ui-strings/src/main/res/values-sk/strings_sc.xml library/ui-strings/src/main/res/values-sv/strings_sc.xml library/ui-strings/src/main/res/values-tr/strings_sc.xml library/ui-strings/src/main/res/values-vi/strings_sc.xml library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml 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/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png vector/build.gradle vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/core/di/FragmentModule.kt vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt vector/src/main/res/xml/vector_settings_labs.xml vector/src/main/res/xml/vector_settings_preferences.xml |
||
|---|---|---|
| .. | ||
| androidTest/java/im/vector/app | ||
| gplay | ||
| main | ||