3 commits

Author	SHA1	Message	Date
Scott Nonnenberg	74374e4313	maybeMergeContacts/create: Put PNI into UUID field if no ACI	2022-08-17 16:12:38 -07:00
Scott Nonnenberg	5d45197fe2	Remove restriction on maybeMergeContacts, combineConversations fixes	2022-08-09 16:46:01 -07:00
Scott Nonnenberg	faf6c41332	Early preparations for PNP Contact Merging	2022-08-09 14:39:00 -07:00