Merge pull request #17595 from eileenmcnaughton/settings
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 14309 MagicMerge.php
-rw-r--r-- 5001 Runtime.php