Merge pull request #21057 from eileenmcnaughton/tok_resolve
authorcolemanw <coleman@civicrm.org>
Mon, 9 Aug 2021 23:44:29 +0000 (19:44 -0400)
committerGitHub <noreply@github.com>
Mon, 9 Aug 2021 23:44:29 +0000 (19:44 -0400)
 dev/core#2747 REF] Move all the generic functions to the parent


Trivial merge