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 |
||
|---|---|---|
| .. | ||
| chatwoot | ||
| chatwoot-web.1.service | ||
| chatwoot-web.target | ||
| chatwoot-worker.1.service | ||
| chatwoot-worker.target | ||
| chatwoot.target | ||
| extract_brand_assets.sh | ||
| nginx_chatwoot.conf | ||
| setup_18.04.sh | ||
| setup_20.04.sh | ||