From: colemanw <coleman@civicrm.org>
Date: Sat, 13 Jul 2019 20:45:33 +0000 (-0400)
Subject: Merge pull request #14818 from totten/master-magic-cache
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bdf5cf8709851d69b806d144f07bb6706ff1195b;p=civicrm-core.git

Merge pull request #14818 from totten/master-magic-cache

MagicMerge - Fix ephemeral overrides for aliased properties
---

bdf5cf8709851d69b806d144f07bb6706ff1195b