Merge pull request #8843 from eileenmcnaughton/merge_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 18 Aug 2016 21:56:01 +0000 (09:56 +1200)
committerGitHub <noreply@github.com>
Thu, 18 Aug 2016 21:56:01 +0000 (09:56 +1200)
commitc67e9596eec2959ae6e43a535109aee409967b58
treeb394273ff1a840eadd226981bac07c350aac63da
parent3661c2ca3df8fa3e15af6db9b3e7ff5f043ca0cb
parent92241006ccbddd570456165c71e78e2a9fabc6c8
Merge pull request #8843 from eileenmcnaughton/merge_fixes

CRM-19197 merge links fix and CRM-19198 Add form merge hook call
CRM/Contact/Page/AJAX.php