CRM-14792 - creates an activity when contacts are merged. Updates to PR 5412 from...
authorDave Greenberg <dave@civicrm.org>
Wed, 18 Mar 2015 00:18:57 +0000 (17:18 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 18 Mar 2015 00:18:57 +0000 (17:18 -0700)
commitd9235b4543466691b3dee45b522cf4360a5393fa
treea388b34a82d43e274d1fa624190af570055368e6
parentcbeccb7b7dee99aa855b772dcec56b15906c881c
CRM-14792 - creates an activity when contacts are merged. Updates to PR 5412 from Joanne (thanks Joanne!).

----------------------------------------
* CRM-14792: create activity with merge text on manual contact merge
  https://issues.civicrm.org/jira/browse/CRM-14792
CRM/Contact/Form/Merge.php
CRM/Upgrade/Incremental/sql/4.6.beta4.mysql.tpl
sql/civicrm_generated.mysql
xml/templates/civicrm_data.tpl