SpiritCroc befb402dbe Merge remote-tracking branch 'cintek/pin_messages' into sc ...

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/202

@SpiritCroc edit:
- change some merge-unfriendly things, e.g.
    - indention
    - strings_sc.xml
    - don't touch what shouldn't be touched
- add icon license to third party
- add FEATURES.md entry

Conflicts:
	library/ui-strings/src/main/res/values/strings.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
	vector-config/src/main/res/values/config-settings.xml
	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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt

Change-Id: I490e42d50276edce3e7b099a11dba90d040d0dc0

2023-08-02 19:41:24 +02:00

..

java/im/vector/app/config

Merge tag 'v1.6.0' into sc

2023-05-22 14:19:46 +02:00

res/values

Merge remote-tracking branch 'cintek/pin_messages' into sc

2023-08-02 19:41:24 +02:00

AndroidManifest.xml

Bump gradle from 7.2.2 to 7.3.1 (#7364)

2022-10-17 09:14:28 +02:00