Merge pull request #11364 from eileenmcnaughton/ps1
authorcolemanw <coleman@civicrm.org>
Mon, 4 Dec 2017 23:38:20 +0000 (18:38 -0500)
committerGitHub <noreply@github.com>
Mon, 4 Dec 2017 23:38:20 +0000 (18:38 -0500)
commitd08c9949cf4dd23d072cb4e1eb5c6ff63d290d1c
treecc7094c9432d84f655b58ba966874c224709f56c
parent8d87dd51ea00df696cc130decaead95483b94e48
parenta28e91983fdc8fdbdfdcdb384b15ae5ddb059d0c
Merge pull request #11364 from eileenmcnaughton/ps1

CRM-21180: Inline changes to custom fields aren't reflected in custom greetings + CRM-21474 add support for setting non-required fields to 'null'