Merge pull request #10975 from eileenmcnaughton/4.7.25-rc
authorTim Otten <totten@civicrm.org>
Tue, 12 Sep 2017 22:08:22 +0000 (15:08 -0700)
committerGitHub <noreply@github.com>
Tue, 12 Sep 2017 22:08:22 +0000 (15:08 -0700)
commit14d9e12c7ce8393f1f41aa1ea76fd651b2ad9dd0
treeb15f9012016a71d0ef6707a219bda2e41743c2c0
parent76f6dea736e6886d1d5f7fa8a1afea94747bbfa6
parent412585fb59dcbcb030c18d2e9a5ae29900e04170
Merge pull request #10975 from eileenmcnaughton/4.7.25-rc

CRM-21175 fix fatal error on multiple custom field import.