From: colemanw <coleman@civicrm.org>
Date: Mon, 9 Aug 2021 23:44:29 +0000 (-0400)
Subject: Merge pull request #21057 from eileenmcnaughton/tok_resolve
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d4f779e4f5b7857ddd6a08cb81e0617e0e80256e;p=civicrm-core.git

Merge pull request #21057 from eileenmcnaughton/tok_resolve

 dev/core#2747 REF] Move all the generic functions to the parent
---

d4f779e4f5b7857ddd6a08cb81e0617e0e80256e