112385fd9e
Resolves 26 conflicts via manual review. Key decisions: - signature: kept fork's send-time architecture (PR #79), discarded upstream's editor-manipulation functions - WhatsApp incoming: combined fork's two-layer locking (source_id + contact phone) with upstream's blocked-contact drop. Fixed pre-existing regression where echoes were silently dropped - InstallationConfig: upstream's simplified coder (validated against legacy YAML-in-jsonb data) - schema.rb: regenerated, stripped kanban tables from other branches, restored f_unaccent SQL function |
||
|---|---|---|
| .. | ||
| administrator_notifications | ||
| agent_notifications | ||
| team_notifications | ||
| application_mailer.rb | ||
| conversation_reply_mailer_attachment_helper.rb | ||
| conversation_reply_mailer_helper.rb | ||
| conversation_reply_mailer.rb | ||
| portal_instructions_mailer.rb | ||
| references_header_builder.rb | ||