Merge pull request #15649 from JMAConsulting/core-1346
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 14315 MagicMerge.php
-rw-r--r-- 4422 Runtime.php