2 commits

Author	SHA1	Message	Date
Abe Jellinek	3a11ac146d	Item merging: Don't merge trashed attachments of any type	2026-03-04 23:14:53 -05:00
Abe Jellinek	c9d108ba5e	Extract merge logic to new module ... Without changes. Most of this code was never called outside items.js, so there was no reason to expose it.	2026-03-04 23:14:53 -05:00