Merge contacts when we discover split or duplicated contacts

This commit is contained in:
Scott Nonnenberg 2020-07-10 11:28:49 -07:00
parent 68e432188b
commit 901179440f
32 changed files with 1199 additions and 824 deletions

View file

@ -60,6 +60,8 @@ const excludedFiles = [
'^ts/Crypto.ts',
'^ts/textsecure/MessageReceiver.js',
'^ts/textsecure/MessageReceiver.ts',
'^ts/ConversationController.js',
'^ts/ConversationController.ts',
// Generated files
'^js/components.js',