Merge pull request #6980 from colemanw/entityRef
authorcolemanw <coleman@civicrm.org>
Fri, 16 Oct 2015 17:14:15 +0000 (13:14 -0400)
committercolemanw <coleman@civicrm.org>
Fri, 16 Oct 2015 17:14:15 +0000 (13:14 -0400)
commitcb7e781d3b2674a3ba41cc992edbc5d0fe735ff2
tree64a7509bea8663245ed25b2e6af59b8020a47fa6
parent1646a28417d0e2ec28994e24523544f7813bd968
parent0ed35ef87aec61886896ce501ea1c539eedbe808
Merge pull request #6980 from colemanw/entityRef

entityRef - Use deep-merge to combine data-params and options