Merge pull request #19067 from eileenmcnaughton/weight
authorcolemanw <coleman@civicrm.org>
Thu, 3 Dec 2020 12:53:35 +0000 (07:53 -0500)
committerGitHub <noreply@github.com>
Thu, 3 Dec 2020 12:53:35 +0000 (07:53 -0500)
commita11f15b9b3e372f27400b3e19ee41d3836aabdad
tree56e9da1e791f291f40d9ac20dd343a7d94448007
parente10c02237ccae1a1b61585e461164bb0dae03095
parent76b6a55c610412ae8374f56d7619d688cfd299f4
Merge pull request #19067 from eileenmcnaughton/weight

Quick fix on summary actions conflict