mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-16 02:05:06 +08:00
b2a2fe2710
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt # tools/check/forbidden_strings_in_code.txt # vector/build.gradle # vector/src/main/java/im/vector/app/core/di/FragmentModule.kt # vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.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/RoomDetailViewState.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/composer/MessageComposerViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/navigation/Navigator.kt # vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt # vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt # vector/src/main/res/layout/fragment_timeline.xml # vector/src/main/res/xml/vector_settings_labs.xml |
||
|---|---|---|
| .. | ||
| benchmark | ||
| check | ||
| emojis | ||
| install | ||
| jitsi | ||
| release | ||
| templates | ||
| tests | ||
| towncrier | ||
| travis | ||
| workmanager | ||
| compressVideo.sh | ||
| debug_alter_scalar_token.sh | ||
| debug_dump_filesystem.sh | ||
| debug_dump_prefs.sh | ||
| hs_diag.py | ||
| import_analytic_plan.sh | ||
| import_emojis.py | ||
| import_sas_strings.py | ||