ariskotsomitopoulos b2a2fe2710 Merge branch 'develop' into feature/aris/threads ...

# 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

2022-01-27 17:11:26 +02:00

..

check_code_quality.sh

textSize *sp -> style

2021-06-15 10:30:54 +02:00

forbidden_strings_in_code_sdk.txt

Fix Copyright mention

2020-10-08 15:11:01 +02:00

forbidden_strings_in_code.txt

Merge branch 'develop' into feature/aris/threads

2022-01-27 17:11:26 +02:00

forbidden_strings_in_layout.txt

Fix code quality issues

2021-12-26 00:48:11 +02:00

forbidden_strings_in_resources.txt

Cleanup

2021-06-14 21:46:05 +02:00