Merge pull request #10390 from JMAConsulting/CRM-20611
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 15476 MagicMerge.php
-rw-r--r-- 6283 Runtime.php