chore: mark upstream commits as integrated

Browse Source

Merge upstream/master using 'ours' strategy to mark the following
commits as integrated (already cherry-picked with customizations):

- chat-utils,sync-action-utils: provide alternatives for the contact name
- example: revamp logging for example
- defaults, index: change shouldSyncHistoryMessage behavior
- history: fortify contact data
- history: add proper logging support in history
- example: cleanup
- socket: no sync warning!!!!!
- Fix connection showing "Online" but disconnected (#2132)
- fix: skip retry for expired status messages over 24 hours old
- fix: optimize getLIDsForPNs and add getPNsForLIDs (#2274)
- fix: extract LID-PN mappings from conversation objects in history sync

Our customizations are preserved. This zeros the "behind" counter.

...

This commit is contained in:

Claude

2026-01-22 20:28:19 +00:00

parent b288c41d11 f829b6d7a8

commit 1a1fc9daff

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available