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
..
attachment-viewer	Merge tag 'v1.5.24' into sc	2023-02-08 13:08:42 +01:00
core-utils	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
external	Rename files to avoid danger issue.	2023-06-23 23:13:52 +02:00
multipicker	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00
rustCrypto	Delete matrix-rust-sdk-crypto.aar from Git repo.	2023-05-03 15:23:29 +02:00
ui-strings	Merge remote-tracking branch 'cintek/pin_messages' into sc	2023-08-02 19:41:24 +02:00
ui-styles	Merge tag 'v1.6.0' into sc	2023-05-22 14:19:46 +02:00