Merge pull request #9790 from fliespl/patch-3
authorMathieu Lu <mathieu@bidon.ca>
Sat, 17 Jun 2017 03:42:51 +0000 (23:42 -0400)
committerGitHub <noreply@github.com>
Sat, 17 Jun 2017 03:42:51 +0000 (23:42 -0400)
commit73c8d0c580b7dcd609389d8b4b7f801e81ea119c
tree24af5c2e73227d1affeaad2849ddce91f1da636d
parent5c89231f3ba1b6558cd1a512cbb61c5445d0e0d6
parent43d1ad94e24e854dc47b5735621eaaa318c263c0
Merge pull request #9790 from fliespl/patch-3

CRM-19896 - customTranslateFunction not mapped
CRM/Core/Config/MagicMerge.php