Merge contacts when we discover split or duplicated contacts

2020-07-10 11:28:49 -07:00
parent 68e432188b
commit 901179440f
32 changed files with 1199 additions and 824 deletions
--- a/background.html
+++ b/background.html
@@ -348,7 +348,6 @@
  <script type='text/javascript' src='js/expiring_tap_to_view_messages.js'></script>

  <script type='text/javascript' src='js/chromium.js'></script>
-  <script type='text/javascript' src='js/conversation_controller.js'></script>
  <script type='text/javascript' src='js/message_controller.js'></script>

  <script type='text/javascript' src='js/views/react_wrapper_view.js'></script>